Mercurial > libavcodec.hg

diff h264.c @ 9028:0f95e4f0a3f5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add and use ff_pixfmt_list_420.
author michael
date Tue, 24 Feb 2009 18:27:52 +0000
parents ccde7fbba09e
children bcf716c58be4
line wrap: on
line diff
--- a/h264.c	Tue Feb 24 18:24:56 2009 +0000
+++ b/h264.c	Tue Feb 24 18:27:52 2009 +0000
@@ -2178,12 +2178,10 @@
     s->quarter_sample = 1;
     s->low_delay= 1;
 
-    if(avctx->codec_id == CODEC_ID_SVQ3)
-        avctx->pix_fmt= PIX_FMT_YUVJ420P;
-    else if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+    if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
         avctx->pix_fmt= PIX_FMT_VDPAU_H264;
     else
-        avctx->pix_fmt= PIX_FMT_YUV420P;
+        avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts);
 
     decode_init_vlc();
 
@@ -8097,6 +8095,7 @@
     /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY,
     .flush= flush_dpb,
     .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
+    .pix_fmts= ff_pixfmt_list_420,
 };
 
 #if CONFIG_H264_VDPAU_DECODER