diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-30 11:58:42 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-12-05 13:25:46 +0100 |
| commit | c99307caee01441cfde24f3b7b0db3037b7022dc (patch) | |
| tree | 443611216e860c68f089b5fd975e243cb763b499 /libavcodec | |
| parent | 0b0a7a751de02464a33717e70352f696372ba1c4 (diff) | |
| download | ffmpeg-c99307caee01441cfde24f3b7b0db3037b7022dc.tar.gz | |
mpegvideo: make frame_size_alloc() static.
It is not called from outside of mpegvideo.c anymore.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 2ced38e1df..5648b82908 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -191,7 +191,7 @@ av_cold int ff_dct_common_init(MpegEncContext *s) return 0; } -int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize) +static int frame_size_alloc(MpegEncContext *s, int linesize) { int alloc_size = FFALIGN(FFABS(linesize) + 32, 32); @@ -270,7 +270,7 @@ static int alloc_frame_buffer(MpegEncContext *s, Picture *pic) } if (!s->edge_emu_buffer && - (ret = ff_mpv_frame_size_alloc(s, pic->f.linesize[0])) < 0) { + (ret = frame_size_alloc(s, pic->f.linesize[0])) < 0) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed to allocate context scratch buffers.\n"); ff_mpeg_unref_picture(s, pic); @@ -636,7 +636,7 @@ int ff_update_duplicate_context(MpegEncContext *dst, MpegEncContext *src) if (dst->avctx->codec_tag == AV_RL32("VCR2")) exchange_uv(dst); if (!dst->edge_emu_buffer && - (ret = ff_mpv_frame_size_alloc(dst, dst->linesize)) < 0) { + (ret = frame_size_alloc(dst, dst->linesize)) < 0) { av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context " "scratch buffers.\n"); return ret; @@ -743,7 +743,7 @@ do {\ // linesize dependend scratch buffer allocation if (!s->edge_emu_buffer) if (s1->linesize) { - if (ff_mpv_frame_size_alloc(s, s1->linesize) < 0) { + if (frame_size_alloc(s, s1->linesize) < 0) { av_log(s->avctx, AV_LOG_ERROR, "Failed to allocate context " "scratch buffers.\n"); return AVERROR(ENOMEM); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index af92799d49..b6fc1bb96b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -772,7 +772,6 @@ void ff_MPV_common_defaults(MpegEncContext *s); void ff_MPV_decode_defaults(MpegEncContext *s); int ff_MPV_common_init(MpegEncContext *s); -int ff_mpv_frame_size_alloc(MpegEncContext *s, int linesize); int ff_MPV_common_frame_size_change(MpegEncContext *s); void ff_MPV_common_end(MpegEncContext *s); void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]); |