diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 17:30:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:03:54 +0100 |
| commit | d511dc653062502ac7a86d9ef47ffeabd6f77364 (patch) | |
| tree | de08d37ef2724816769b0143d3e1866129b965d6 /libavcodec/h264.h | |
| parent | a0b39747b7213b5b76c0ce5984c1dac63933737f (diff) | |
| parent | bc98e8c0e0a8babfea35c98855e366b29cbe1191 (diff) | |
Merge commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191'
* commit 'bc98e8c0e0a8babfea35c98855e366b29cbe1191':
h264: move mb_field_decoding_flag into the per-slice context
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 0b44b441e7..e5a6a17c50 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -401,6 +401,8 @@ typedef struct H264SliceContext { int mb_skip_run; int is_complex; + int mb_field_decoding_flag; + int redundant_pic_count; /** @@ -537,7 +539,6 @@ typedef struct H264Context { // interlacing specific flags int mb_aff_frame; - int mb_field_decoding_flag; int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag int picture_structure; int first_field; |