[FFmpeg-cvslog] lavc: factorise setting buffer type in avcodec_default_get_buffer().

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Nov 12 20:01:32 2012 +0100| [387bef95d28019c13c6805cfa4079e59948284e5] | committer: Anton Khirnov

lavc: factorise setting buffer type in avcodec_default_get_buffer().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=387bef95d28019c13c6805cfa4079e59948284e5
---

 libavcodec/utils.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 6752ed9..1185a35 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);