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.h | |
| parent | ff53c79d0aefcef91e0a57125aeaffa08b326e56 (diff) | |
| parent | adedd840e20cbcf6b23b41d415581dc03bcce4c6 (diff) | |
| download | ffmpeg-7f92f3d8129f44bc2ed935e9d81735ffdcd9921f.tar.gz | |
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.h')
| -rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 1dbf3ec26b..ae71d68036 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -500,6 +500,7 @@ typedef struct H264Context{ */ MMCO mmco[MAX_MMCO_COUNT]; int mmco_index; + int mmco_reset; int long_ref_count; ///< number of actual long term references int short_ref_count; ///< number of actual short term references |