Commit a7f46586 authored by Anton Khirnov's avatar Anton Khirnov

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

Needed e.g. for h264 cropping to work properly.
parent 505642f1
...@@ -555,10 +555,8 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) ...@@ -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 { \ ...@@ -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: ...@@ -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)
......
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