[FFmpeg-cvslog] Merge commit 'ff24824a721576195c3b4a711e3ee2af900de795' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  4 23:22:03 2014 +0200| [3b364ac18a42182d0cd04f4041081469d3956132] | committer: Michael Niedermayer

Merge commit 'ff24824a721576195c3b4a711e3ee2af900de795' into release/2.4

* commit 'ff24824a721576195c3b4a711e3ee2af900de795':
  h264: reset ret to avoid propagating minor failures

See: 47048aa30b5c35fc8b030e819b9769b6bca03c08
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b364ac18a42182d0cd04f4041081469d3956132
---