diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-09 20:37:11 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-21 10:20:58 +0100 |
| commit | e962bd08ee4b087d36ab0d7d7b3c90a642d46b3e (patch) | |
| tree | 9c191d729812a0dfa18dc62e645178ffd8b65995 /libavcodec/h264.c | |
| parent | 6d2b6f21eb45ffbda1103c772060303648714832 (diff) | |
| download | ffmpeg-e962bd08ee4b087d36ab0d7d7b3c90a642d46b3e.tar.gz | |
h264: add a parameter to the CHROMA422 macro.
This way it does not look like a constant.
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c350f492bd..a8926d77a9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2042,7 +2042,7 @@ static av_always_inline void backup_mb_border(H264Context *h, uint8_t *src_y, int top_idx = 1; const int pixel_shift = h->pixel_shift; int chroma444 = CHROMA444; - int chroma422 = CHROMA422; + int chroma422 = CHROMA422(h); src_y -= linesize; src_cb -= uvlinesize; @@ -2931,7 +2931,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h) return AV_PIX_FMT_GBRP9; } else return AV_PIX_FMT_YUV444P9; - } else if (CHROMA422) + } else if (CHROMA422(h)) return AV_PIX_FMT_YUV422P9; else return AV_PIX_FMT_YUV420P9; @@ -2942,7 +2942,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h) return AV_PIX_FMT_GBRP10; } else return AV_PIX_FMT_YUV444P10; - } else if (CHROMA422) + } else if (CHROMA422(h)) return AV_PIX_FMT_YUV422P10; else return AV_PIX_FMT_YUV420P10; @@ -2954,7 +2954,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h) } else return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ444P : AV_PIX_FMT_YUV444P; - } else if (CHROMA422) { + } else if (CHROMA422(h)) { return h->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P : AV_PIX_FMT_YUV422P; } else { |