diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-11-29 22:22:44 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-12-03 08:24:27 -0800 |
| commit | adedd840e20cbcf6b23b41d415581dc03bcce4c6 (patch) | |
| tree | d049a9d2155f167b474f9bf7047ff730eddf1ffc /libavcodec/h264_refs.c | |
| parent | 55a280569f0e886d62076a60888601ab9a7a4b42 (diff) | |
h264: fix frame reordering code.
Fixes fate-h264-conformance-{mr2_tandberg_e,mr3_tandberg_b} without
requiring -strict 1.
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 370b5c312d..273c52b475 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -582,13 +582,9 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ for(j = 0; j < 16; j++) { remove_long(h, j, 0); } - s->current_picture_ptr->poc= - s->current_picture_ptr->field_poc[0]= - s->current_picture_ptr->field_poc[1]= - h->poc_lsb= - h->poc_msb= h->frame_num= s->current_picture_ptr->frame_num= 0; + h->mmco_reset = 1; s->current_picture_ptr->mmco_reset=1; break; default: assert(0); |