diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:59:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 06:05:19 +0100 |
| commit | a81a2b514eec4614fca277c0cbd8f5a1dbe2946e (patch) | |
| tree | 4b0f175b2b90be9e667297f9eba01395fe80530b /libavcodec/h264_ps.c | |
| parent | 6102dda1d754925e384e7e195441b1e6cd6d9a9c (diff) | |
| parent | 5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27 (diff) | |
| download | ffmpeg-a81a2b514eec4614fca277c0cbd8f5a1dbe2946e.tar.gz | |
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index cf27b4588c..7a749272d5 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -445,7 +445,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) sps->ref_frame_count = get_ue_golomb_31(&h->gb); if (h->avctx->codec_tag == MKTAG('S', 'M', 'V', '2')) sps->ref_frame_count = FFMAX(2, sps->ref_frame_count); - if (sps->ref_frame_count > MAX_PICTURE_COUNT - 2 || + if (sps->ref_frame_count > H264_MAX_PICTURE_COUNT - 2 || sps->ref_frame_count > 16U) { av_log(h->avctx, AV_LOG_ERROR, "too many reference frames %d\n", sps->ref_frame_count); |