[FFmpeg-cvslog] avformat/utils: Export coded dimensions unconditionally
Michael Niedermayer
git at videolan.org
Mon Jun 13 13:10:19 CEST 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jun 5 03:55:41 2016 +0200| [60de31e98c1630c11d13a4789e1dfacddc31ef9d] | committer: Michael Niedermayer
avformat/utils: Export coded dimensions unconditionally
This fixes a API regression
Probably fixes Ticket5451
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60de31e98c1630c11d13a4789e1dfacddc31ef9d
---
libavformat/utils.c | 4 ++--
libavformat/version.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index cb8d910..7d44af0 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 c92a23f..5679cce 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
More information about the ffmpeg-cvslog
mailing list