Fix merge.

diff --cc ChangeLog
index b540313a3744025ec5cdc4557311c57d41f72bcd,25f30294a3f915084a11f772dc61a4a933ee525c..0b93c2ac38f0e2521c7d9bfd2f66272c28612190
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,22 +1,32 @@@
 +2012-12-18  Carl Hetherington  <cth@carlh.net>
 +
 +      * Alter film viewer so that it is much quicker, responds instantly
 +      to changes in video filtering settings, and can (roughly) play the
 +      source material back.
 +
 +      * Make the examination of content for length optional, so that
 +      if a source file has an accurate header you can trust it.
 +
+ 2012-12-18  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.67 released.
+ 
+ 2012-12-18  Carl Hetherington  <cth@carlh.net>
+ 
+       * Support non-planar float and signed
+       16-bit planar audio; be less
+       crashy when unsupported audio formats
+       are found.
+ 
+ 2012-12-18  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.66 released.
+ 
+ 2012-12-18  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.65 released.
++>>>>>>> master
+ 
  2012-12-13  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.64 released.

diff --cc src/lib/ffmpeg_decoder.cc
Simple merge

diff --cc wscript
Simple merge