-<<<<<<< HEAD
+2014-11-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.21 released.
+
+2014-11-12 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.0.20 released.
+
+2014-11-10 Carl Hetherington <cth@carlh.net>
+
+ * Guess initial scale from the size of video
+ content images, taking pixel aspect ratio into
+ account where possible.
+
+2014-11-07 c.hetherington <cth@carlh.net>
+
+ * Add a hint if there is 3D content in a proposed 2D DCP.
+
+2014-11-06 Carl Hetherington <cth@carlh.net>
+
+ * Basic support for emailing a report of
+ a problem (#43).
+
+2014-11-05 c.hetherington <cth@carlh.net>
+
+ * Add a few more hints.
+
2014-10-30 Carl Hetherington <cth@carlh.net>
* Version 2.0.19 released.
2014-10-26 Carl Hetherington <cth@carlh.net>
* Version 2.0.17 released.
-=======
+
2014-11-02 Carl Hetherington <cth@carlh.net>
* Be more tolerant of some FFmpeg audio decoding errors;
should fix #352.
->>>>>>> fc8fb8f... Process decoded audio even if avcodec_decode_audio4 returns an error, as there are cases where it produces good data and then returns an error.
2014-10-26 Carl Hetherington <cth@carlh.net>