Merge branch 'master' into speed-up
authorCarl Hetherington <cth@carlh.net>
Sat, 15 Dec 2012 01:01:12 +0000 (01:01 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 15 Dec 2012 01:01:12 +0000 (01:01 +0000)
commit0b781dd65a90e617866810ecb3dee27267449f1f
treeab79f468e93e6093d45c4e9e49c9e3dccad0e6ed
parent2247247a5294af70890cf68f3f9be930f3729d95
parent83afdbcfe5d36a64d945843396ddadd22ea4691b
Merge branch 'master' into speed-up
ChangeLog
src/lib/ffmpeg_decoder.cc