diff options
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/lavc_conv.c | 15 | ||||
| -rw-r--r-- | sub/sd_lavc.c | 4 |
2 files changed, 0 insertions, 19 deletions
diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c index 4824344a19..d47b0c4c07 100644 --- a/sub/lavc_conv.c +++ b/sub/lavc_conv.c @@ -31,8 +31,6 @@ #include "misc/bstr.h" #include "sd.h" -#define HAVE_AV_WEBVTT (LIBAVCODEC_VERSION_MICRO >= 100) - struct lavc_conv { struct mp_log *log; AVCodecContext *avctx; @@ -94,10 +92,8 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log, const char *codec_name, av_dict_free(&opts); // Documented as "set by libavcodec", but there is no other way avctx->time_base = (AVRational) {1, 1000}; -#if LIBAVCODEC_VERSION_MICRO >= 100 avctx->pkt_timebase = avctx->time_base; avctx->sub_charenc_mode = FF_SUB_CHARENC_MODE_IGNORE; -#endif priv->avctx = avctx; priv->extradata = talloc_strndup(priv, avctx->subtitle_header, avctx->subtitle_header_size); @@ -117,8 +113,6 @@ char *lavc_conv_get_extradata(struct lavc_conv *priv) return priv->extradata; } -#if HAVE_AV_WEBVTT - // FFmpeg WebVTT packets are pre-parsed in some way. The FFmpeg Matroska // demuxer does this on its own. In order to free our demuxer_mkv.c from // codec-specific crud, we do this here. @@ -220,15 +214,6 @@ static int parse_webvtt(AVPacket *in, AVPacket *pkt) return 0; } -#else - -static int parse_webvtt(AVPacket *in, AVPacket *pkt) -{ - return -1; -} - -#endif - // Return a NULL-terminated list of ASS event lines and have // the AVSubtitle display PTS and duration set to input // double variables. diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index 3febe023d6..3ae8fc8905 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -78,9 +78,7 @@ static int init(struct sd *sd) // Supported codecs must be known to decode to paletted bitmaps switch (cid) { case AV_CODEC_ID_DVB_SUBTITLE: -#if LIBAVCODEC_VERSION_MICRO >= 100 case AV_CODEC_ID_DVB_TELETEXT: -#endif case AV_CODEC_ID_HDMV_PGS_SUBTITLE: case AV_CODEC_ID_XSUB: case AV_CODEC_ID_DVD_SUBTITLE: @@ -99,9 +97,7 @@ static int init(struct sd *sd) goto error; mp_lavc_set_extradata(ctx, sd->codec->extradata, sd->codec->extradata_size); priv->pkt_timebase = mp_get_codec_timebase(sd->codec); -#if LIBAVCODEC_VERSION_MICRO >= 100 ctx->pkt_timebase = priv->pkt_timebase; -#endif if (avcodec_open2(ctx, sub_codec, NULL) < 0) goto error; priv->avctx = ctx; |