virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

ff_get_buffer(): allocate the frame for max(coded,display) dimensions

Browse Source 
Needed e.g. for h264 cropping to work properly.
This commit is contained in:
Anton Khirnov 2013-02-18 16:29:03 +01:00
parent 505642f182
commit a7f46586bf
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/utils.c
View File

@ -555,10 +555,8 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
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)
@ -702,6 +700,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:
@ -712,7 +713,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_reget_buffer(AVCodecContext *avctx, AVFrame *frame) int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame)