Browse Source

avformat/utils: Export coded dimensions unconditionally

This fixes a API regression
Probably fixes Ticket5451

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.1
Michael Niedermayer 9 years ago
parent
commit
60de31e98c
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      libavformat/utils.c
  2. +1
    -1
      libavformat/version.h

+ 2
- 2
libavformat/utils.c View File

@@ -3803,8 +3803,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
av_codec_set_lowres(st->codec, av_codec_get_lowres(st->internal->avctx)); av_codec_set_lowres(st->codec, av_codec_get_lowres(st->internal->avctx));
st->codec->width = st->internal->avctx->width; st->codec->width = st->internal->avctx->width;
st->codec->height = st->internal->avctx->height; 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')) if (st->codec->codec_tag != MKTAG('t','m','c','d'))
@@ -3821,6 +3819,8 @@ FF_DISABLE_DEPRECATION_WARNINGS
} }


// Fields unavailable in AVCodecParameters // 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; st->codec->properties = st->internal->avctx->properties;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif


+ 1
- 1
libavformat/version.h View File

@@ -29,7 +29,7 @@


#include "libavutil/version.h" #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 // Also please add any ticket numbers that you belive might regress here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 37 #define LIBAVFORMAT_VERSION_MINOR 37


Loading…
Cancel
Save