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)
1  2 
ChangeLog
src/lib/ffmpeg_decoder.cc

diff --cc ChangeLog
index d7cd6adf85a86e81b2b1dde654f3846b5fd22ff0,0bfcdd4d928df5f6055bb6346ee4e249e009c514..7c6f4ebdde0727b1691df2d9a2ba67faf39fc009
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2014-03-07  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add subtitle view.
 +
+ 2014-03-08  Carl Hetherington  <cth@carlh.net>
+       * Support for unsigned 8-bit audio (hmm!).
  2014-03-06  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.65.0 released.
Simple merge