From 64c01a814c8f7cf4a780b89fe00ed608b1f93e2b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 16 Mar 2014 10:04:46 +0100
Subject: Remove some more unneeded version checks

All of these check against things that happened before the latest
supported FFmpeg/Libav release.
---
 demux/demux_mkv.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'demux')

diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index c7526a7421..2b17e7e457 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -77,17 +77,6 @@ static const int cook_fl2bps[COOK_FLAVORS] = {
     12016, 16408, 22911, 33506
 };
 
-#define IS_LIBAV_FORK (LIBAVCODEC_VERSION_MICRO < 100)
-
-// Both of these versions were bumped by unrelated commits.
-#if (IS_LIBAV_FORK  && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 7,  1)) || \
-    (!IS_LIBAV_FORK && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 12, 101))
-#define NEED_WAVPACK_PARSE 1
-#else
-#define NEED_WAVPACK_PARSE 0
-#endif
-
-
 enum {
     MAX_NUM_LACES = 256,
 };
@@ -2108,7 +2097,6 @@ static void mkv_seek_reset(demuxer_t *demuxer)
     }
 }
 
-#if NEED_WAVPACK_PARSE
 // Copied from libavformat/matroskadec.c (FFmpeg 310f9dd / 2013-05-30)
 // Originally added with Libav commit 9b6f47c
 // License: LGPL v2.1 or later
@@ -2189,12 +2177,10 @@ fail:
     talloc_free(dst);
     return -1;
 }
-#endif
 
 static bool mkv_parse_packet(mkv_track_t *track, bstr *raw, bstr *out)
 {
     if (track->a_formattag == MP_FOURCC('W', 'V', 'P', 'K')) {
-#if NEED_WAVPACK_PARSE
         int size = raw->len;
         uint8_t *parsed;
         if (libav_parse_wavpack(track, raw->start, &parsed, &size) >= 0) {
@@ -2203,7 +2189,6 @@ static bool mkv_parse_packet(mkv_track_t *track, bstr *raw, bstr *out)
             *raw = (bstr){0};
             return true;
         }
-#endif
     } else if (track->codec_id && strcmp(track->codec_id, MKV_V_PRORES) == 0) {
         size_t newlen = raw->len + 8;
         char *data = talloc_size(track->parser_tmp, newlen);
-- 
cgit v1.2.3