diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-04 01:02:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-04 01:02:37 +0100 |
| commit | 7f92f3d8129f44bc2ed935e9d81735ffdcd9921f (patch) | |
| tree | 1b56b42bedce2ed6b28e629055be671be027e7b5 /libavcodec/h264_refs.c | |
| parent | ff53c79d0aefcef91e0a57125aeaffa08b326e56 (diff) | |
| parent | adedd840e20cbcf6b23b41d415581dc03bcce4c6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: fix frame reordering code.
fate: Add a test for the VBLE decoder
doc: break some long lines in developer.texi
drawtext: make x and y parametric
drawtext: manage memory allocation better
drawtext: refactor draw_text
doc: remove space between variable and post increment in example code
Conflicts:
doc/developer.texi
doc/filters.texi
libavcodec/h264.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 efd65f2fce..c75cbf11e5 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); |