Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 8 Mar 2014 13:15:06 +0000 (13:15 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 8 Mar 2014 13:15:06 +0000 (13:15 +0000)
commita4c19a34244aeaf183c25878933b570fc5c0ee34
tree9fd6f8d17dfde7969da1f166b7b25e85b252f450
parentcab9a1d569396065a6e9eb39386736908564d6b4
parent04bfeac6ccfe4e4c981a241f53138c765a0864a7
Merge master.
ChangeLog
src/lib/ffmpeg_decoder.cc