ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Fri May 5 11:33:17 2017 +0200| [20e72faef6946cde8e59981ef511b824a01c5adb] | committer: Clément Bœsch
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed' * commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed': h264dec: make ff_h264_decode_init() static Merged-by: Clément Bœsch <cboe...@gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20e72faef6946cde8e59981ef511b824a01c5adb --- libavcodec/h264dec.c | 6 +++--- libavcodec/h264dec.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 25aeba7d71..35ab51f616 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -388,7 +388,7 @@ static av_cold int h264_decode_end(AVCodecContext *avctx) static AVOnce h264_vlc_init = AV_ONCE_INIT; -av_cold int ff_h264_decode_init(AVCodecContext *avctx) +static av_cold int h264_decode_init(AVCodecContext *avctx) { H264Context *h = avctx->priv_data; int ret; @@ -1072,7 +1072,7 @@ AVCodec ff_h264_decoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), - .init = ff_h264_decode_init, + .init = h264_decode_init, .close = h264_decode_end, .decode = h264_decode_frame, .capabilities = /*AV_CODEC_CAP_DRAW_HORIZ_BAND |*/ AV_CODEC_CAP_DR1 | @@ -1100,7 +1100,7 @@ AVCodec ff_h264_vdpau_decoder = { .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, .priv_data_size = sizeof(H264Context), - .init = ff_h264_decode_init, + .init = h264_decode_init, .close = h264_decode_end, .decode = h264_decode_frame, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index e994f7e7fe..1c0dfbf7f7 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -571,7 +571,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, const H2645NAL *nal, void *logctx); void ff_h264_hl_decode_mb(const H264Context *h, H264SliceContext *sl); -int ff_h264_decode_init(AVCodecContext *avctx); void ff_h264_decode_init_vlc(void); /** ====================================================================== diff --cc libavcodec/h264dec.c index 25aeba7d71,e111d40c35..35ab51f616 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@@ -1085,29 -808,3 +1085,29 @@@ AVCodec ff_h264_decoder = .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), .priv_class = &h264_class, }; + +#if CONFIG_H264_VDPAU_DECODER && FF_API_VDPAU +static const AVClass h264_vdpau_class = { + .class_name = "H264 VDPAU Decoder", + .item_name = av_default_item_name, + .option = h264_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_h264_vdpau_decoder = { + .name = "h264_vdpau", + .long_name = NULL_IF_CONFIG_SMALL("H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 (VDPAU acceleration)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_H264, + .priv_data_size = sizeof(H264Context), - .init = ff_h264_decode_init, ++ .init = h264_decode_init, + .close = h264_decode_end, + .decode = h264_decode_frame, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HWACCEL_VDPAU, + .flush = flush_dpb, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_VDPAU_H264, + AV_PIX_FMT_NONE}, + .profiles = NULL_IF_CONFIG_SMALL(ff_h264_profiles), + .priv_class = &h264_vdpau_class, +}; +#endif _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
