diff options
Diffstat (limited to 'sub/lavc_conv.c')
| -rw-r--r-- | sub/lavc_conv.c | 15 |
1 files changed, 0 insertions, 15 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. |