diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-05 03:55:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-13 13:07:55 +0200 |
| commit | 60de31e98c1630c11d13a4789e1dfacddc31ef9d (patch) | |
| tree | e5da3690f4a98e439f3e405c6544389e1361b8f6 | |
| parent | 66023612955d9d839be842c00f8b0b4610009a24 (diff) | |
| download | ffmpeg-60de31e98c1630c11d13a4789e1dfacddc31ef9d.tar.gz | |
avformat/utils: Export coded dimensions unconditionally
This fixes a API regression
Probably fixes Ticket5451
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/utils.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index cb8d91008d..7d44af0f5e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3803,8 +3803,6 @@ FF_DISABLE_DEPRECATION_WARNINGS av_codec_set_lowres(st->codec, av_codec_get_lowres(st->internal->avctx)); st->codec->width = st->internal->avctx->width; st->codec->height = st->internal->avctx->height; - st->codec->coded_width = st->internal->avctx->coded_width; - st->codec->coded_height = st->internal->avctx->coded_height; } if (st->codec->codec_tag != MKTAG('t','m','c','d')) @@ -3821,6 +3819,8 @@ FF_DISABLE_DEPRECATION_WARNINGS } // Fields unavailable in AVCodecParameters + st->codec->coded_width = st->internal->avctx->coded_width; + st->codec->coded_height = st->internal->avctx->coded_height; st->codec->properties = st->internal->avctx->properties; FF_ENABLE_DEPRECATION_WARNINGS #endif diff --git a/libavformat/version.h b/libavformat/version.h index c92a23fe5e..5679cce3de 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" -// When bumping major check Ticket5467, 5421 for regressing +// When bumping major check Ticket5467, 5421, 5451(compatibility with Chromium) for regressing // Also please add any ticket numbers that you belive might regress here #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 37 |