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_mb_template.c | |
parent | a0b39747b7213b5b76c0ce5984c1dac63933737f (diff) | |
parent | bc98e8c0e0a8babfea35c98855e366b29cbe1191 (diff) | |
download | ffmpeg-d511dc653062502ac7a86d9ef47ffeabd6f77364.tar.gz |
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_mb_template.c')
-rw-r--r-- | libavcodec/h264_mb_template.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 52d60be93b..a03bdc2ac5 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -66,7 +66,7 @@ static av_noinline void FUNC(hl_decode_mb)(const H264Context *h, H264SliceContex h->list_counts[mb_xy] = sl->list_count; - if (!SIMPLE && MB_FIELD(h)) { + if (!SIMPLE && MB_FIELD(sl)) { linesize = sl->mb_linesize = h->linesize * 2; uvlinesize = sl->mb_uvlinesize = h->uvlinesize * 2; block_offset = &h->block_offset[48]; @@ -291,7 +291,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(const H264Context *h, H264SliceCo h->list_counts[mb_xy] = sl->list_count; - if (!SIMPLE && MB_FIELD(h)) { + if (!SIMPLE && MB_FIELD(sl)) { linesize = sl->mb_linesize = sl->mb_uvlinesize = h->linesize * 2; block_offset = &h->block_offset[48]; if (mb_y & 1) // FIXME move out of this function? |