diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:07:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:07:01 +0100 |
| commit | 9d0450ae943a7d1071fa59bfd0c4f7647d733c5f (patch) | |
| tree | d1ebfb43b856fa79589c3e67580e7e6deb631c1b /libavcodec/h264.h | |
| parent | d511dc653062502ac7a86d9ef47ffeabd6f77364 (diff) | |
| parent | e9b2383bf86b38ad18a001801aee20c8182e29bd (diff) | |
Merge commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd'
* commit 'e9b2383bf86b38ad18a001801aee20c8182e29bd':
h264: move mb_mbaff into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e5a6a17c50..45545b6cdb 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -402,6 +402,7 @@ typedef struct H264SliceContext { int is_complex; int mb_field_decoding_flag; + int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag int redundant_pic_count; @@ -539,7 +540,6 @@ typedef struct H264Context { // interlacing specific flags int mb_aff_frame; - int mb_mbaff; ///< mb_aff_frame && mb_field_decoding_flag int picture_structure; int first_field; |