Merge commit '9ecabd7892ff073ae60ded3fc0a1290f5914ed5c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 21:58:15 +0000 (22:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 21:59:46 +0000 (22:59 +0100)
commit2510e820c43c08d1c2ddf5291054c6f93afc1369
tree1202fadd723d6b2937b2b8fc7717fcd9539dafdd
parent87e46dd5fb8bdfdee0ed7645ac992ce958431ed2
parent9ecabd7892ff073ae60ded3fc0a1290f5914ed5c
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@gmx.at>
libavcodec/h264_ps.c