diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 15:07:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 15:07:45 +0100 |
| commit | ea4b477a1b3c2c7cda8cb62a986691cdb7b1cac4 (patch) | |
| tree | 7d40556d954169ef21968fb56d6e4673d2a8fbfb /libavcodec/utils.c | |
| parent | 9ab8f3738a4cf386538a76e97490237d7a5a249b (diff) | |
| parent | f7e85ee996b3886c2b13e928b83277382311af96 (diff) | |
Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
lavc: allow the caller to override dimensions in ff_get_buffer()
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4299a44b65..d6283a1e2a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -764,8 +764,6 @@ int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) switch (avctx->codec->type) { case AVMEDIA_TYPE_VIDEO: - frame->width = FFMAX(avctx->width, FF_CEIL_RSHIFT(avctx->coded_width, avctx->lowres)); - frame->height = FFMAX(avctx->height, FF_CEIL_RSHIFT(avctx->coded_height, avctx->lowres)); if (frame->format < 0) frame->format = avctx->pix_fmt; if (!frame->sample_aspect_ratio.num) @@ -834,6 +832,7 @@ FF_ENABLE_DEPRECATION_WARNINGS static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) { + int override_dimensions = 1; int ret; if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -842,6 +841,13 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) return AVERROR(EINVAL); } } + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + if (frame->width <= 0 || frame->height <= 0) { + frame->width = FFMAX(avctx->width, FF_CEIL_RSHIFT(avctx->coded_width, avctx->lowres)); + frame->height = FFMAX(avctx->height, FF_CEIL_RSHIFT(avctx->coded_height, avctx->lowres)); + override_dimensions = 0; + } + } if ((ret = ff_init_buffer_info(avctx, frame)) < 0) return ret; @@ -964,7 +970,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ret = avctx->get_buffer2(avctx, frame, flags); - if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { + if (avctx->codec_type == AVMEDIA_TYPE_VIDEO && !override_dimensions) { frame->width = avctx->width; frame->height = avctx->height; } |