diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 22:58:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 22:59:46 +0100 |
| commit | 2510e820c43c08d1c2ddf5291054c6f93afc1369 (patch) | |
| tree | 1202fadd723d6b2937b2b8fc7717fcd9539dafdd | |
| parent | 87e46dd5fb8bdfdee0ed7645ac992ce958431ed2 (diff) | |
| parent | 9ecabd7892ff073ae60ded3fc0a1290f5914ed5c (diff) | |
| download | ffmpeg-2510e820c43c08d1c2ddf5291054c6f93afc1369.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h264_ps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index e278781b55..04b29041c2 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -252,7 +252,9 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps) if (sps->num_reorder_frames > 16U /* max_dec_frame_buffering || max_dec_frame_buffering > 16 */) { av_log(h->avctx, AV_LOG_ERROR, - "illegal num_reorder_frames %d\n", sps->num_reorder_frames); + "Clipping illegal num_reorder_frames %d\n", + sps->num_reorder_frames); + sps->num_reorder_frames = 16; return AVERROR_INVALIDDATA; } } |