h264: Rename the jpeg_420 pixfmt list to match the common naming structure
authorMartin Storsjö <martin@martin.st>
Wed, 6 Mar 2013 19:18:00 +0000 (21:18 +0200)
committerMartin Storsjö <martin@martin.st>
Thu, 7 Mar 2013 06:40:04 +0000 (08:40 +0200)
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/h264.c

index aa2b1a7..610c815 100644 (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
     AV_PIX_FMT_DXVA2_VLD,
 #endif
 #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 ?
             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;
                                         h264_hwaccel_pixfmt_list_420);
         }
         break;