From: Michael Niedermayer Date: Thu, 3 Oct 2013 10:04:37 +0000 (+0200) Subject: Merge remote-tracking branch 'qatar/master' X-Git-Tag: android-x86-4.4-r1~820 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a63fb66936a2732b9d59edf3cebc4b6291f5d08;p=android-x86%2Fexternal-ffmpeg.git Merge remote-tracking branch 'qatar/master' * qatar/master: lavc: mark deprecated AVCodec.max_lowres for removal on next bump Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer --- 5a63fb66936a2732b9d59edf3cebc4b6291f5d08 diff --cc libavcodec/avcodec.h index 1ae89d5aed,d5353083ad..2cf30dd92a --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@@ -2932,7 -2706,9 +2932,9 @@@ typedef struct AVCodec const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 const uint64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 + #if FF_API_LOWRES - attribute_deprecated uint8_t max_lowres; ///< maximum value for lowres supported by the decoder + uint8_t max_lowres; ///< maximum value for lowres supported by the decoder + #endif const AVClass *priv_class; ///< AVClass for the private context const AVProfile *profiles; ///< array of recognized profiles, or NULL if unknown, array is terminated by {FF_PROFILE_UNKNOWN}