virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

mpegvideo: make frame_size_alloc() static.

Browse Source 
It is not called from outside of mpegvideo.c anymore.
This commit is contained in:
Anton Khirnov
2013-11-30 11:58:42 +01:00
parent 0b0a7a751d
commit c99307caee
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo.c
View File

@ -191,7 +191,7 @@ av_cold int ff_dct_common_init(MpegEncContext *s)
return 0; 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); 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 && 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, av_log(s->avctx, AV_LOG_ERROR,
"get_buffer() failed to allocate context scratch buffers.\n"); "get_buffer() failed to allocate context scratch buffers.\n");
ff_mpeg_unref_picture(s, pic); 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")) if (dst->avctx->codec_tag == AV_RL32("VCR2"))
exchange_uv(dst); exchange_uv(dst);
if (!dst->edge_emu_buffer && 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 " av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context "
"scratch buffers.\n"); "scratch buffers.\n");
return ret; return ret;
@ -743,7 +743,7 @@ do {\
// linesize dependend scratch buffer allocation // linesize dependend scratch buffer allocation
if (!s->edge_emu_buffer) if (!s->edge_emu_buffer)
if (s1->linesize) { 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 " av_log(s->avctx, AV_LOG_ERROR, "Failed to allocate context "
"scratch buffers.\n"); "scratch buffers.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

1
libavcodec/mpegvideo.h
View File

@ -772,7 +772,6 @@ void ff_MPV_common_defaults(MpegEncContext *s);
void ff_MPV_decode_defaults(MpegEncContext *s); void ff_MPV_decode_defaults(MpegEncContext *s);
int ff_MPV_common_init(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); int ff_MPV_common_frame_size_change(MpegEncContext *s);
void ff_MPV_common_end(MpegEncContext *s); void ff_MPV_common_end(MpegEncContext *s);
void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]); void ff_MPV_decode_mb(MpegEncContext *s, int16_t block[12][64]);