diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 13:06:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 13:06:14 +0100 |
| commit | 86d9d349cce54984ef7f4b67647ae73bf1c48f88 (patch) | |
| tree | f1a65e0d48eb386d67b993fd9e56ddf3051614cd /libavcodec/h264_mb_template.c | |
| parent | 92656787cfeaf28af368bd4c20ffbaedc8ad3ca9 (diff) | |
| parent | 23e85be58fc64b2e804e68b0034a08a6d257e523 (diff) | |
| download | ffmpeg-86d9d349cce54984ef7f4b67647ae73bf1c48f88.tar.gz | |
Merge commit '23e85be58fc64b2e804e68b0034a08a6d257e523'
* commit '23e85be58fc64b2e804e68b0034a08a6d257e523':
h264: add a parameter to the CHROMA444 macro.
h264: add a parameter to the CHROMA422 macro.
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb_template.c')
| -rw-r--r-- | libavcodec/h264_mb_template.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c index 8ef93a1453..15cb3c9a24 100644 --- a/libavcodec/h264_mb_template.c +++ b/libavcodec/h264_mb_template.c @@ -53,7 +53,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h) const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || h->avctx->codec_id == AV_CODEC_ID_H264; void (*idct_add)(uint8_t *dst, int16_t *block, int stride); const int block_h = 16 >> h->chroma_y_shift; - const int chroma422 = CHROMA422; + const int chroma422 = CHROMA422(h); dest_y = h->cur_pic.f.data[0] + ((mb_x << PIXEL_SHIFT) + mb_y * h->linesize) * 16; dest_cb = h->cur_pic.f.data[1] + (mb_x << PIXEL_SHIFT) * 8 + mb_y * h->uvlinesize * block_h; |