diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:15 +0100 |
| commit | bc98e8c0e0a8babfea35c98855e366b29cbe1191 (patch) | |
| tree | 0dbf428535cd1236545a6c31b3d3f57c7d65b911 /libavcodec/h264_mb_template.c | |
| parent | 6490a0c0fbe0e55f765ea2aa2e8495181ea1f719 (diff) | |
| download | ffmpeg-bc98e8c0e0a8babfea35c98855e366b29cbe1191.tar.gz | |
h264: move mb_field_decoding_flag into the per-slice context
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 7396327178..94de31634c 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]; @@ -294,7 +294,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? |