From a24e6cd7773c8f10cf1fc86eab96c570f99ca7bd Mon Sep 17 00:00:00 2001 From: Tuomas Virtanen Date: Wed, 14 Nov 2018 18:33:07 +0200 Subject: Use macros for checking avcodec features --- src/internal/kitdecoder.c | 6 +++--- src/internal/subtitle/renderers/kitsubass.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/internal/kitdecoder.c b/src/internal/kitdecoder.c index 09e46d3..b4a69e6 100644 --- a/src/internal/kitdecoder.c +++ b/src/internal/kitdecoder.c @@ -78,9 +78,9 @@ Kit_Decoder* Kit_CreateDecoder(const Kit_Source *src, int stream_index, codec_ctx->thread_type = FF_THREAD_SLICE|FF_THREAD_FRAME; // This is required for ass_process_chunk() support - if(LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 25, 100)) { - av_dict_set(&codec_opts, "sub_text_format", "ass", 0); - } +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 25, 100) + av_dict_set(&codec_opts, "sub_text_format", "ass", 0); +#endif // Open the stream if(avcodec_open2(codec_ctx, codec, &codec_opts) < 0) { diff --git a/src/internal/subtitle/renderers/kitsubass.c b/src/internal/subtitle/renderers/kitsubass.c index c229406..505d80f 100644 --- a/src/internal/subtitle/renderers/kitsubass.c +++ b/src/internal/subtitle/renderers/kitsubass.c @@ -55,20 +55,20 @@ static void ren_render_ass_cb(Kit_SubtitleRenderer *ren, void *src, double pts, for(int r = 0; r < sub->num_rects; r++) { if(sub->rects[r]->ass == NULL) continue; - if(LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,25,100)) { - ass_process_data( - ass_ren->track, - sub->rects[r]->ass, - strlen(sub->rects[r]->ass)); - } else { - // This requires the sub_text_format codec_opt set for ffmpeg - ass_process_chunk( - ass_ren->track, - sub->rects[r]->ass, - strlen(sub->rects[r]->ass), - start_ms, - end_ms); - } +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,25,100) + ass_process_data( + ass_ren->track, + sub->rects[r]->ass, + strlen(sub->rects[r]->ass)); +#else + // This requires the sub_text_format codec_opt set for ffmpeg + ass_process_chunk( + ass_ren->track, + sub->rects[r]->ass, + strlen(sub->rects[r]->ass), + start_ms, + end_ms); +#endif } Kit_UnlockDecoderOutput(ren->dec); } -- cgit v1.2.3