ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Fri Jan 1 16:48:47 2016 +0100| [42ff56e362e823f5292c0d661fd35778da2d7eef] | committer: Hendrik Leppkes
lavc: fix profile declarations for vdpau decoders > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42ff56e362e823f5292c0d661fd35778da2d7eef --- libavcodec/h264.c | 2 +- libavcodec/vc1dec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a89be34..545ac14 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2004,7 +2004,7 @@ AVCodec ff_h264_vdpau_decoder = { .flush = flush_dpb, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264, AV_PIX_FMT_NONE}, - .profiles = NULL_IF_CONFIG_SMALL(profiles), + .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), .priv_class = &h264_vdpau_class, }; #endif diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index c9ee199..f66afb9 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1165,7 +1165,7 @@ AVCodec ff_wmv3_vdpau_decoder = { .decode = vc1_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_WMV3, AV_PIX_FMT_NONE }, - .profiles = NULL_IF_CONFIG_SMALL(profiles) + .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles) }; #endif @@ -1181,7 +1181,7 @@ AVCodec ff_vc1_vdpau_decoder = { .decode = vc1_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_VDPAU_VC1, AV_PIX_FMT_NONE }, - .profiles = NULL_IF_CONFIG_SMALL(profiles) + .profiles = NULL_IF_CONFIG_SMALL(ff_vc1_profiles) }; #endif _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
