diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-30 14:00:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-02 16:57:49 +0200 |
| commit | ad72d7d299c4b8355d4e3809bb9d5dbe8ac6cbb5 (patch) | |
| tree | edce99bcb1c35845e5727c4f34d176361886c9f5 /libavformat | |
| parent | 3402871f36f9d5ec5670190663ebe30c8e15c436 (diff) | |
avformat: Copy properties from internal context
Fixes Ticket5467 "Lossless j2k information no longer shown"
Based on suggestion by Hendrik Leppkes
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/dump.c | 3 | ||||
| -rw-r--r-- | libavformat/utils.c | 3 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index 9eb6146785..e016a37e9f 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -453,6 +453,9 @@ static void dump_stream_format(AVFormatContext *ic, int i, return; } + // Fields which are missing from AVCodecParameters need to be taken from the AVCodecContext + avctx->properties = st->codec->properties; + if (separator) av_opt_set(avctx, "dump_separator", separator, 0); avcodec_string(buf, sizeof(buf), avctx, is_output); diff --git a/libavformat/utils.c b/libavformat/utils.c index 47f5ba0b11..ac056c49d4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3805,6 +3805,9 @@ FF_DISABLE_DEPRECATION_WARNINGS memcpy(st->codec->subtitle_header, st->internal->avctx->subtitle_header, st->codec->subtitle_header_size); } + + // Fields unavailable in AVCodecParameters + st->codec->properties = st->internal->avctx->properties; FF_ENABLE_DEPRECATION_WARNINGS #endif diff --git a/libavformat/version.h b/libavformat/version.h index d10e93e921..acfa513ba0 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -29,6 +29,8 @@ #include "libavutil/version.h" +// When bumping major check Ticket5467 for regressing +// Also please add any ticket numbers that you belive might regress here #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 37 #define LIBAVFORMAT_VERSION_MICRO 101 |