diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 15:50:18 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 15:50:18 +0400 |
| commit | bf4d0f8328c8f64611ca44a6ffdc30ca4f028249 (patch) | |
| tree | e37df66f9571e2753a827c23ba8c075a8af5d323 /libavcodec/h264_mb_template.c | |
| parent | e168b508163d7dc05176d81e6b5ea73ac23eb38b (diff) | |
| parent | 7fa00653a550c0d24b3951c0f9fed6350ecf5ce4 (diff) | |
Merge commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4'
* commit '7fa00653a550c0d24b3951c0f9fed6350ecf5ce4':
h264: add a parameter to the FIELD_PICTURE macro.
h264: add a parameter to the FRAME_MBAFF macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.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 bd42fb3231..8ef93a1453 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -73,7 +73,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) dest_cb -= h->uvlinesize * (block_h - 1); dest_cr -= h->uvlinesize * (block_h - 1); } - if (FRAME_MBAFF) { + if (FRAME_MBAFF(h)) { int list; for (list = 0; list < h->list_count; list++) { if (!USES_LIST(mb_type, list)) @@ -295,7 +295,7 @@ static av_noinline void FUNC(hl_decode_mb_444)(H264Context *h) if (mb_y & 1) // FIXME move out of this function? for (p = 0; p < 3; p++) dest[p] -= h->linesize * 15; - if (FRAME_MBAFF) { + if (FRAME_MBAFF(h)) { int list; for (list = 0; list < h->list_count; list++) { if (!USES_LIST(mb_type, list)) |