diff options
| author | Martin Storsjö <martin@martin.st> | 2013-03-06 21:18:00 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-03-07 08:40:04 +0200 |
| commit | d65522e826fccd97c40d7cc4a170e027910c60b4 (patch) | |
| tree | d49656d50808cb496291f472808acad4d907652e /libavcodec | |
| parent | e760e1d408261566814e24c43119d7aca538d2eb (diff) | |
| download | ffmpeg-d65522e826fccd97c40d7cc4a170e027910c60b4.tar.gz | |
h264: Rename the jpeg_420 pixfmt list to match the common naming structure
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index aa2b1a7910..610c815732 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -78,7 +78,7 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_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 @@ -2839,7 +2839,7 @@ static enum PixelFormat get_pixel_format(H264Context *h) return h->avctx->get_format(h->avctx, h->avctx->codec->pix_fmts ? h->avctx->codec->pix_fmts : h->avctx->color_range == AVCOL_RANGE_JPEG ? - hwaccel_pixfmt_list_h264_jpeg_420 : + h264_hwaccel_pixfmt_list_jpeg_420 : h264_hwaccel_pixfmt_list_420); } break; |