[FFmpeg-cvslog] avformat: Copy properties from internal context

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon May 30 14:00:53 2016 +0200| [ad72d7d299c4b8355d4e3809bb9d5dbe8ac6cbb5] | committer: Michael Niedermayer

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad72d7d299c4b8355d4e3809bb9d5dbe8ac6cbb5
---

 libavformat/dump.c    |    3 +++
 libavformat/utils.c   |    3 +++
 libavformat/version.h |    2 ++
 3 files changed, 8 insertions(+)

diff --git a/libavformat/dump.c b/libavformat/dump.c
index 9eb6146..e016a37 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 47f5ba0..ac056c4 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 d10e93e..acfa513 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