ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Sat Mar 5 10:15:30 2016 +0100| [0443b2cf790f62fa1405ec7e916a9416a7dc4b16] | committer: Clément Bœsch
lavc: restore ABI compatibility with 3.x (sub_text_format) Regression introduced in 2941282. Reported-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0443b2cf790f62fa1405ec7e916a9416a7dc4b16 --- libavcodec/avcodec.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5dc4b73..e249e65 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3289,12 +3289,6 @@ typedef struct AVCodecContext { #define FF_SUB_CHARENC_MODE_AUTOMATIC 0 ///< libavcodec will select the mode itself #define FF_SUB_CHARENC_MODE_PRE_DECODER 1 ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv - int sub_text_format; -#define FF_SUB_TEXT_FMT_ASS 0 -#if FF_API_ASS_TIMING -#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1 -#endif - /** * Skip processing alpha if supported by codec. * Note that if the format uses pre-multiplied alpha (common with VP6, @@ -3387,6 +3381,18 @@ typedef struct AVCodecContext { * afterwards owned and managed by libavcodec. */ AVBufferRef *hw_frames_ctx; + + /** + * Control the form of AVSubtitle.rects[N]->ass + * - decoding: set by user + * - encoding: unused + */ + int sub_text_format; +#define FF_SUB_TEXT_FMT_ASS 0 +#if FF_API_ASS_TIMING +#define FF_SUB_TEXT_FMT_ASS_WITH_TIMINGS 1 +#endif + } AVCodecContext; AVRational av_codec_get_pkt_timebase (const AVCodecContext *avctx); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
