Browse Source

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>
tags/n3.1
Michael Niedermayer 9 years ago
parent
commit
ad72d7d299
3 changed files with 8 additions and 0 deletions
  1. +3
    -0
      libavformat/dump.c
  2. +3
    -0
      libavformat/utils.c
  3. +2
    -0
      libavformat/version.h

+ 3
- 0
libavformat/dump.c View File

@@ -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);


+ 3
- 0
libavformat/utils.c View File

@@ -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



+ 2
- 0
libavformat/version.h View File

@@ -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


Loading…
Cancel
Save