diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 00:18:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 00:18:22 +0100 |
| commit | fa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb (patch) | |
| tree | 4d361e7dfeb04cb0684a355d13bfe06d60ad529b /libavcodec | |
| parent | ff9b607489e6b295d57b9b97f1c23b0a66b273a6 (diff) | |
| parent | 5da51284937649a8ebb84fa951c235438fcbf8ae (diff) | |
| download | ffmpeg-fa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb.tar.gz | |
Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'
* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
cavs: Add a dependency on h264chroma
lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs
Conflicts:
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 e8eca16340..2960bae174 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -68,7 +68,7 @@ static const uint8_t div6[QP_MAX_NUM + 1] = { 14,14,14,14, }; -static const enum AVPixelFormat hwaccel_pixfmt_list_h264_420[] = { +static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = { #if CONFIG_H264_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, #endif @@ -85,7 +85,7 @@ static const enum AVPixelFormat hwaccel_pixfmt_list_h264_420[] = { AV_PIX_FMT_NONE }; -static const enum AVPixelFormat hwaccel_pixfmt_list_h264_jpeg_420[] = { +static const enum AVPixelFormat h264_hwaccel_pixfmt_list_jpeg_420[] = { #if CONFIG_H264_DXVA2_HWACCEL AV_PIX_FMT_DXVA2_VLD, #endif @@ -2972,8 +2972,8 @@ static enum PixelFormat get_pixel_format(H264Context *h, int force_callback) const enum AVPixelFormat * fmt = h->avctx->codec->pix_fmts ? h->avctx->codec->pix_fmts : h->avctx->color_range == AVCOL_RANGE_JPEG ? - hwaccel_pixfmt_list_h264_jpeg_420 : - hwaccel_pixfmt_list_h264_420; + h264_hwaccel_pixfmt_list_jpeg_420 : + h264_hwaccel_pixfmt_list_420; for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++) if (fmt[i] == h->avctx->pix_fmt && !force_callback) |