Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'

* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed': h264dec: make ff_h264_decode_init() static

Clément Bœsch committed 9 years ago

Commit 20e72fa2 parents cb0eba7 f1af37b2 files · +3 −4Browse files

Unified · Split

2 files

@@ -388,7 +388,7 @@ static av_cold int h264_decode_end(AVCodecContext *avctx) · 387 unmodified lines
388	388
389	389	static AVOnce h264_vlc_init = AV_ONCE_INIT;
390	390
391		−av_cold int ff_h264_decode_init(AVCodecContext *avctx)
	391	+static av_cold int h264_decode_init(AVCodecContext *avctx)
392	392	{
393	393	H264Context *h = avctx->priv_data;
394	394	int ret;
@@ -1072,7 +1072,7 @@ AVCodec ff_h264_decoder = { · 677 unmodified lines
1072	1072	.type = AVMEDIA_TYPE_VIDEO,
1073	1073	.id = AV_CODEC_ID_H264,
1074	1074	.priv_data_size = sizeof(H264Context),
1075		− .init = ff_h264_decode_init,
	1075	+ .init = h264_decode_init,
1076	1076	.close = h264_decode_end,
1077	1077	.decode = h264_decode_frame,
1078	1078	.capabilities = /AV_CODEC_CAP_DRAW_HORIZ_BAND \|/ AV_CODEC_CAP_DR1 \|
@@ -1100,7 +1100,7 @@ AVCodec ff_h264_vdpau_decoder = { · 21 unmodified lines
1100	1100	.type = AVMEDIA_TYPE_VIDEO,
1101	1101	.id = AV_CODEC_ID_H264,
1102	1102	.priv_data_size = sizeof(H264Context),
1103		− .init = ff_h264_decode_init,
	1103	+ .init = h264_decode_init,
1104	1104	.close = h264_decode_end,
1105	1105	.decode = h264_decode_frame,
1106	1106	.capabilities = AV_CODEC_CAP_DR1 \| AV_CODEC_CAP_DELAY \| AV_CODEC_CAP_HWACCEL_VDPAU,

@@ -571,7 +571,6 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext sl, GetBitContext gb, · 570 unmodified lines
571	571	const H2645NAL nal, void logctx);
572	572
573	573	void ff_h264_hl_decode_mb(const H264Context h, H264SliceContext sl);
574		−int ff_h264_decode_init(AVCodecContext *avctx);
575	574	void ff_h264_decode_init_vlc(void);
576	575
577	576	/**

Keyboard shortcuts