generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: factorise setting buffer type in avcodec_default_get_buffer().

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-12 20:01:32 +01:00
parent e57c4706e9
commit 387bef95d2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utils.c
View File

@ -320,8 +320,6 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
return ret; return ret;
} }
frame->type = FF_BUFFER_TYPE_INTERNAL;
avci->audio_data = frame->data[0]; avci->audio_data = frame->data[0];
if (avctx->debug & FF_DEBUG_BUFFERS) if (avctx->debug & FF_DEBUG_BUFFERS)
av_log(avctx, AV_LOG_DEBUG, "default_get_buffer called on frame %p, " 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->height = s->height;
buf->pix_fmt = s->pix_fmt; buf->pix_fmt = s->pix_fmt;
} }
pic->type = FF_BUFFER_TYPE_INTERNAL;
for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { for (i = 0; i < AV_NUM_DATA_POINTERS; i++) {
pic->base[i] = buf->base[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) int avcodec_default_get_buffer(AVCodecContext *avctx, AVFrame *frame)
{ {
frame->type = FF_BUFFER_TYPE_INTERNAL;
switch (avctx->codec_type) { switch (avctx->codec_type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
return video_get_buffer(avctx, frame); return video_get_buffer(avctx, frame);