diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-22 22:36:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-22 22:36:57 +0100 |
| commit | d375c1040032ed42f84b7d4ea53baad4a661b628 (patch) | |
| tree | f5bb63830cbc49106376a418c292c452f3b0728d /libavcodec/h264.h | |
| parent | 038566a5edc73205120f30d41233a9911a42da44 (diff) | |
| download | ffmpeg-d375c1040032ed42f84b7d4ea53baad4a661b628.tar.gz | |
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index b403968485..770a7ecb59 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -392,9 +392,9 @@ typedef struct H264Context{ /** * num_ref_idx_l0/1_active_minus1 + 1 */ + uint8_t *list_counts; ///< Array of list_count per MB specifying the slice type unsigned int ref_count[2]; ///< counts frames or fields, depending on current mb mode unsigned int list_count; - uint8_t *list_counts; ///< Array of list_count per MB specifying the slice type Picture ref_list[2][48]; /**< 0..15: frame refs, 16..47: mbaff field refs. Reordered version of default_ref_list according to picture reordering in slice header */ @@ -504,7 +504,9 @@ typedef struct H264Context{ Picture *long_ref[32]; Picture default_ref_list[2][32]; ///< base reference list for all slices of a coded picture Picture *delayed_pic[MAX_DELAYED_PIC_COUNT+2]; //FIXME size? + Picture *next_output_pic; int outputed_poc; + int next_outputed_poc; /** * memory management control operations buffer. |