h264dec: make ff_h264_decode_init() static

It is not called from outside h264dec.c anymore.

Anton Khirnov committed 9 years ago

Commit f1af37b1 parent e7de05f2 files · +2 −3Browse files

Unified · Split

2 files

libavcodec/h264dec.c +2 −2
libavcodec/h264dec.h +0 −1

libavcodec/h264dec.c+2−2

@@ -361,7 +361,7 @@ static av_cold int h264_decode_end(AVCodecContext *avctx) · 360 unmodified lines
361		361
362	static AVOnce h264_vlc_init = AV_ONCE_INIT;	362	static AVOnce h264_vlc_init = AV_ONCE_INIT;
363		363
364	av_cold int ff_h264_decode_init(AVCodecContext *avctx)	364	static av_cold int h264_decode_init(AVCodecContext *avctx)
365	{	365	{
366	H264Context *h = avctx->priv_data;	366	H264Context *h = avctx->priv_data;
367	int ret;	367	int ret;
@@ -795,7 +795,7 @@ AVCodec ff_h264_decoder = { · 427 unmodified lines
795	.type = AVMEDIA_TYPE_VIDEO,	795	.type = AVMEDIA_TYPE_VIDEO,
796	.id = AV_CODEC_ID_H264,	796	.id = AV_CODEC_ID_H264,
797	.priv_data_size = sizeof(H264Context),	797	.priv_data_size = sizeof(H264Context),
798	.init = ff_h264_decode_init,	798	.init = h264_decode_init,
799	.close = h264_decode_end,	799	.close = h264_decode_end,
800	.decode = h264_decode_frame,	800	.decode = h264_decode_frame,
801	.capabilities = /AV_CODEC_CAP_DRAW_HORIZ_BAND \|/ AV_CODEC_CAP_DR1 \|	801	.capabilities = /AV_CODEC_CAP_DRAW_HORIZ_BAND \|/ AV_CODEC_CAP_DR1 \|

libavcodec/h264dec.h+0−1

@@ -553,7 +553,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext sl, GetBitContext gb, · 552 unmodified lines
553	const H2645NAL nal, void logctx);	553	const H2645NAL nal, void logctx);
554		554
555	void ff_h264_hl_decode_mb(const H264Context h, H264SliceContext sl);	555	void ff_h264_hl_decode_mb(const H264Context h, H264SliceContext sl);
556	int ff_h264_decode_init(AVCodecContext *avctx);
557	void ff_h264_decode_init_vlc(void);	556	void ff_h264_decode_init_vlc(void);
558		557
559	/**	558	/**