Commit 387bef95 authored by Anton Khirnov's avatar Anton Khirnov

lavc: factorise setting buffer type in avcodec_default_get_buffer().

parent e57c4706
...@@ -320,8 +320,6 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame) ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment