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.c | |
| parent | d511dc653062502ac7a86d9ef47ffeabd6f77364 (diff) | |
| parent | e9b2383bf86b38ad18a001801aee20c8182e29bd (diff) | |
| download | ffmpeg-9d0450ae943a7d1071fa59bfd0c4f7647d733c5f.tar.gz | |
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.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a53be146e7..c3f2f2e4a5 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -90,7 +90,7 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, fill_rectangle(&sl->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1); fill_rectangle(sl->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32((*mv)[0][0][0], (*mv)[0][0][1]), 4); - h->mb_mbaff = + sl->mb_mbaff = sl->mb_field_decoding_flag = 0; ff_h264_hl_decode_mb(h, &h->slice_ctx[0]); } |