diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 20:21:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 20:23:05 +0200 |
| commit | c40f51e15b91898e5c69fca7c8c67e3da6624dd4 (patch) | |
| tree | 54104b07c4657196b9c8cb7bf58d1bda465963dd /libavcodec/h264_refs.c | |
| parent | 30db867cb7be54fd8e756640b4e18cb20a70a64a (diff) | |
| download | ffmpeg-c40f51e15b91898e5c69fca7c8c67e3da6624dd4.tar.gz | |
h264: Always decode MMCOs into temprary array
When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index ac87715473..8f6262a37b 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -746,7 +746,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb, int first_slice) { int i, ret; - MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = first_slice ? h->mmco : mmco_temp; + MMCO mmco_temp[MAX_MMCO_COUNT], *mmco = mmco_temp; int mmco_index = 0; if (h->nal_unit_type == NAL_IDR_SLICE) { // FIXME fields @@ -812,6 +812,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb, } if (first_slice && mmco_index != -1) { + memcpy(h->mmco, mmco_temp, sizeof(h->mmco)); h->mmco_index = mmco_index; } else if (!first_slice && mmco_index >= 0 && (mmco_index != h->mmco_index || |