generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Rename the jpeg_420 pixfmt list to match the common naming structure

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-03-06 21:18:00 +02:00
parent e760e1d408
commit d65522e826
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -78,7 +78,7 @@ static const enum AVPixelFormat h264_hwaccel_pixfmt_list_420[] = {
AV_PIX_FMT_NONE 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 #if CONFIG_H264_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_DXVA2_VLD,
#endif #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 ? return h->avctx->get_format(h->avctx, h->avctx->codec->pix_fmts ?
h->avctx->codec->pix_fmts : h->avctx->codec->pix_fmts :
h->avctx->color_range == AVCOL_RANGE_JPEG ? h->avctx->color_range == AVCOL_RANGE_JPEG ?
hwaccel_pixfmt_list_h264_jpeg_420 : h264_hwaccel_pixfmt_list_jpeg_420 :
h264_hwaccel_pixfmt_list_420); h264_hwaccel_pixfmt_list_420);
} }
break; break;