[FFmpeg-cvslog] Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 18 22:58:15 2014 +0100| [2510e820c43c08d1c2ddf5291054c6f93afc1369] | committer: Michael Niedermayer

Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'

* commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c':
  h264: reset num_reorder_frames if it is invalid

Note, num_reorder_frames is not used in the failure case

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

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