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

Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72'

Browse Source 
* commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72':
  ff_get_buffer(): allocate the frame for max(coded,display) dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-19 21:40:46 +02:00
parent 194d0399a2 a7f46586bf
commit a8b05dde0d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/utils.c
View File

@@ -621,10 +621,8 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame)
switch (avctx->codec->type) { switch (avctx->codec->type) {
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (!frame->width) frame->width = FFMAX(avctx->width, avctx->coded_width);
frame->width = avctx->width; frame->height = FFMAX(avctx->height, avctx->coded_height);
if (!frame->height)
frame->height = avctx->height;
if (frame->format < 0) if (frame->format < 0)
frame->format = avctx->pix_fmt; frame->format = avctx->pix_fmt;
if (!frame->sample_aspect_ratio.num) if (!frame->sample_aspect_ratio.num)
@@ -799,6 +797,9 @@ do { \
av_buffer_unref(&dummy_buf); av_buffer_unref(&dummy_buf);
frame->width = avctx->width;
frame->height = avctx->height;
return 0; return 0;
fail: fail:
@@ -809,7 +810,14 @@ fail:
} }
#endif #endif
return avctx->get_buffer2(avctx, frame, flags); ret = avctx->get_buffer2(avctx, frame, flags);
if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) {
frame->width = avctx->width;
frame->height = avctx->height;
}
return ret;
} }
int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)