diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:43:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:43:32 +0100 |
| commit | e168b508163d7dc05176d81e6b5ea73ac23eb38b (patch) | |
| tree | d6fc72152fcc1e94a4b101380bdf62a28432d564 /libavcodec/h264_mb_template.c | |
| parent | 137df692fc28710aa1a21856b1f5b9e157896fef (diff) | |
| parent | da6be8fcec16a94d8084bda8bb8a0a411a96bcf7 (diff) | |
Merge commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7'
* commit 'da6be8fcec16a94d8084bda8bb8a0a411a96bcf7':
h264: add a parameter to the MB_FIELD macro.
h264: add a parameter to the MB_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.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 d75a4dd1d1..bd42fb3231 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -64,7 +64,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) h->list_counts[mb_xy] = h->list_count; - if (!SIMPLE && MB_FIELD) { + if (!SIMPLE && MB_FIELD(h)) { linesize = h->mb_linesize = h->linesize * 2; uvlinesize = h->mb_uvlinesize = h->uvlinesize * 2; block_offset = &h->block_offset[48]; @@ -289,7 +289,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) h->list_counts[mb_xy] = h->list_count; - if (!SIMPLE && MB_FIELD) { + if (!SIMPLE && MB_FIELD(h)) { linesize = h->mb_linesize = h->mb_uvlinesize = h->linesize * 2; block_offset = &h->block_offset[48]; if (mb_y & 1) // FIXME move out of this function? |