[FFmpeg-cvslog] Merge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 29 21:02:45 2014 +0200| [56c47364c3b50c66c54b3372650f7fd542d998bb] | committer: Michael Niedermayer

Merge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'

* commit '2cd7c99498b1bcb450c328459cf85a686ce83456':
  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=56c47364c3b50c66c54b3372650f7fd542d998bb
---