diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-11-10 20:55:00 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-11-10 20:55:00 +0000 |
| commit | 602dd2d359f4ee1e47805d92ef57676006a24e3e (patch) | |
| tree | e661d1f11912e0a05106cf4d7272e78f52c9d61a /libavcodec/h264.c | |
| parent | 44be1d6478cd1549ec06d06d06db46c4287a3782 (diff) | |
| download | ffmpeg-602dd2d359f4ee1e47805d92ef57676006a24e3e.tar.gz | |
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
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d148c010cb..e2b15c7082 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 |