[SCM] libav/experimental: Add .pix_fmts to H264 VDPAU decoder declaration and remove obsolete test for codec->capabilities.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 602dd2d359f4ee1e47805d92ef57676006a24e3e
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Tue Nov 10 20:55:00 2009 +0000

    Add .pix_fmts to H264 VDPAU decoder declaration and remove obsolete test
    for codec->capabilities.
    
    Originally committed as revision 20505 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d148c01..e2b15c7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2196,9 +2196,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
     if(!avctx->has_b_frames)
     s->low_delay= 1;
 
-    if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
-        avctx->pix_fmt= PIX_FMT_VDPAU_H264;
-    else
         avctx->pix_fmt= avctx->get_format(avctx, avctx->codec->pix_fmts);
     avctx->hwaccel = ff_find_hwaccel(avctx->codec->id, avctx->pix_fmt);
     avctx->chroma_sample_location = AVCHROMA_LOC_LEFT;
@@ -8191,6 +8188,7 @@ AVCodec h264_vdpau_decoder = {
     CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU,
     .flush= flush_dpb,
     .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"),
+    .pix_fmts = (const enum PixelFormat[]){PIX_FMT_VDPAU_H264, PIX_FMT_NONE},
 };
 #endif
 

-- 
Libav/FFmpeg packaging