diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 11:33:17 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 11:33:39 +0200 |
| commit | 20e72faef6946cde8e59981ef511b824a01c5adb (patch) | |
| tree | e35c82f841089a3e1dfd52adabbef05ec5fccf6d | |
| parent | cb0eba71f047944ccc1220fca04c50f45f88a8ff (diff) | |
| parent | f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed (diff) | |
| download | ffmpeg-20e72faef6946cde8e59981ef511b824a01c5adb.tar.gz | |
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
h264dec: make ff_h264_decode_init() static
Merged-by: Clément Bœsch <cboesch@gopro.com>
| -rw-r--r-- | libavcodec/h264dec.c | 6 | ||||
| -rw-r--r-- | 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); /** |