diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-03-29 13:52:21 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-03-30 17:46:52 +0200 |
| commit | 9ad80ef3db41a70a4c272f17216b6e09011368ea (patch) | |
| tree | 13327d27adb2091309aa5d83ffa1cec2e8c96739 /libavcodec | |
| parent | afd8a3957bb682d4075a38d56f1f0596634ff72c (diff) | |
h264: Make ff_h264_decode_end() static, it is not used externally.
Also drop the now unnecessary ff_ prefix from its name.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d49857e4d6..520a97d80b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4559,7 +4559,7 @@ av_cold void ff_h264_free_context(H264Context *h) av_freep(h->pps_buffers + i); } -av_cold int ff_h264_decode_end(AVCodecContext *avctx) +static av_cold int h264_decode_end(AVCodecContext *avctx) { H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; @@ -4596,7 +4596,7 @@ AVCodec ff_h264_decoder = { .id = CODEC_ID_H264, .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, - .close = ff_h264_decode_end, + .close = h264_decode_end, .decode = decode_frame, .capabilities = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | @@ -4615,7 +4615,7 @@ AVCodec ff_h264_vdpau_decoder = { .id = CODEC_ID_H264, .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, - .close = ff_h264_decode_end, + .close = h264_decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, .flush = flush_dpb, diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 8680f5fdbd..99c46cc86a 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -663,7 +663,6 @@ void ff_h264_hl_decode_mb(H264Context *h); int ff_h264_frame_start(H264Context *h); int ff_h264_decode_extradata(H264Context *h); av_cold int ff_h264_decode_init(AVCodecContext *avctx); -av_cold int ff_h264_decode_end(AVCodecContext *avctx); av_cold void ff_h264_decode_init_vlc(void); /** |