aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-01-01 20:03:05 +0100
committerAnton Khirnov <anton@khirnov.net>2014-01-20 12:49:47 +0100
commitf7e85ee996b3886c2b13e928b83277382311af96 (patch)
tree4ab50cb42bc4844850643fa76624e6332895d917 /libavcodec
parent0d43b114ccba5514b52832b82bfffe9c137182c5 (diff)
downloadffmpeg-f7e85ee996b3886c2b13e928b83277382311af96.tar.gz
lavc: allow the caller to override dimensions in ff_get_buffer()
This will be useful for allocating edges in the encoders.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/utils.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 1b29b1b884..ed68d0f555 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -572,12 +572,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags)
{
+ int override_dimensions = 1;
int ret;
switch (avctx->codec_type) {
case AVMEDIA_TYPE_VIDEO:
- frame->width = FFMAX(avctx->width, avctx->coded_width);
- frame->height = FFMAX(avctx->height, avctx->coded_height);
+ if (frame->width <= 0 || frame->height <= 0) {
+ frame->width = FFMAX(avctx->width, avctx->coded_width);
+ frame->height = FFMAX(avctx->height, avctx->coded_height);
+ override_dimensions = 0;
+ }
if (frame->format < 0)
frame->format = avctx->pix_fmt;
if (!frame->sample_aspect_ratio.num)
@@ -738,7 +742,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;
}