diff options
| author | Jeff Downs <heydowns@somuchpressure.net> | 2011-07-05 14:21:54 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-08-19 14:36:40 +0200 |
| commit | 29a09eae9a827f4dbc9c4517180d8fe2ecef321a (patch) | |
| tree | dad7ab725ab718c9a9148f837eaac8f113ea00c6 /libavcodec | |
| parent | bb337b4fbceb6af7f70ef2f9476733cc2fa5350b (diff) | |
| download | ffmpeg-29a09eae9a827f4dbc9c4517180d8fe2ecef321a.tar.gz | |
h264: correct the check for invalid long term frame index in MMCO decode
The current check on MMCO parameters prohibits a "max long term frame index
plus 1" of 16 (frame idx of 15) for the "set max long term frame index" MMCO.
Fix this off-by-one error to allow the full range of legal values.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index ce29caf2f0..1f30916413 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -685,7 +685,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb){ } if(opcode==MMCO_SHORT2LONG || opcode==MMCO_LONG2UNUSED || opcode==MMCO_LONG || opcode==MMCO_SET_MAX_LONG){ unsigned int long_arg= get_ue_golomb_31(gb); - if(long_arg >= 32 || (long_arg >= 16 && !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){ + if(long_arg >= 32 || (long_arg >= 16 && !(opcode == MMCO_SET_MAX_LONG && long_arg == 16) && !(opcode == MMCO_LONG2UNUSED && FIELD_PICTURE))){ av_log(h->s.avctx, AV_LOG_ERROR, "illegal long ref in memory management control operation %d\n", opcode); return -1; } |