Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:33:17 +0000 (11:33 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:33:39 +0000 (11:33 +0200)
* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
1  2 
libavcodec/h264dec.c
libavcodec/h264dec.h

@@@ -1085,29 -808,3 +1085,29 @@@ AVCodec ff_h264_decoder = 
      .profiles              = NULL_IF_CONFIG_SMALL(ff_h264_profiles),
      .priv_class            = &h264_class,
  };
-     .init           = ff_h264_decode_init,
 +
 +#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           = 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
Simple merge