[FFmpeg-cvslog] h264: Rename the jpeg_420 pixfmt list to match the common naming structure

Martin Storsjö git at videolan.org
Thu Mar 7 11:34:26 CET 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Mar  6 21:18:00 2013 +0200| [d65522e826fccd97c40d7cc4a170e027910c60b4] | committer: Martin Storsjö

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

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d65522e826fccd97c40d7cc4a170e027910c60b4
---

 libavcodec/h264.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index aa2b1a7..610c815 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;



More information about the ffmpeg-cvslog mailing list