Merge master.

diff --cc ChangeLog
index a650dbf20564de92967347eee0a56ce698cfc0ff,da38791d6238eb391f56d086721205f940c88f4f..c044e54501c32f3d344328c69f9f538131a0676a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,11 +1,15 @@@
 +2014-10-05  Carl Hetherington  <cth@carlh.net>
 +
 +      * Bump ffmpeg version.
 +
+ 2014-10-06  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.74.0 released.
+ 
+ 2014-10-06  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.73.9 released.
+ 
  2014-09-28  Carl Hetherington  <cth@carlh.net>
  
        * Version 1.73.8 released.

diff --cc cscript
Simple merge