diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-11-12 20:01:32 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-12-04 21:45:23 +0100 |
| commit | 387bef95d28019c13c6805cfa4079e59948284e5 (patch) | |
| tree | 69b3e28504a263a0c4829101f83c75da5684aecb | |
| parent | e57c4706e969afa1f2384481b955ccd9494cddb5 (diff) | |
| download | ffmpeg-387bef95d28019c13c6805cfa4079e59948284e5.tar.gz | |
lavc: factorise setting buffer type in avcodec_default_get_buffer().
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 6752ed9e5d..1185a35e9d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -320,8 +320,6 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) return ret; } - frame->type = FF_BUFFER_TYPE_INTERNAL; - avci->audio_data = frame->data[0]; if (avctx->debug & FF_DEBUG_BUFFERS) av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p, " @@ -434,7 +432,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) buf->height = s->height; buf->pix_fmt = s->pix_fmt; } - pic->type = FF_BUFFER_TYPE_INTERNAL; for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { pic->base[i] = buf->base[i]; @@ -453,6 +450,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame) { + frame->type = FF_BUFFER_TYPE_INTERNAL; switch (avctx->codec_type) { case AVMEDIA_TYPE_VIDEO: return video_get_buffer(avctx, frame); |