spek

commit d2fe8e09e6391cb24d745e7e4b6f23d65d8c62e8
parent ee8bc49ed4a93a14a933ecb0eebfe424111f8413
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Sat,  9 Jan 2016 17:32:37 -0800

Bump required lavc version

Diffstat:
M
configure.ac
 | 
2
+-
M
src/spek-audio.cc
 | 
11
-----------

2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -47,7 +47,7 @@ AM_COND_IF([USE_VALGRIND], [use_valgrind=yes], [use_valgrind=no])
 AC_CHECK_LIB(m, log10)
 
 PKG_CHECK_MODULES(AVFORMAT, [libavformat >= 53.17])
-PKG_CHECK_MODULES(AVCODEC, [libavcodec >= 53.25])
+PKG_CHECK_MODULES(AVCODEC, [libavcodec >= 55.46])
 PKG_CHECK_MODULES(AVUTIL, [libavutil >= 51.17])
 
 AM_OPTIONS_WXCONFIG
diff --git a/src/spek-audio.cc b/src/spek-audio.cc
@@ -26,17 +26,6 @@ extern "C" {
 
 #include "spek-audio.h"
 
-// TODO: Remove these macros after Debian switches to libav 9.
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0)
-#define avcodec_free_frame av_freep
-#endif
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
-#define AV_CODEC_ID_AAC CODEC_ID_AAC
-#define AV_CODEC_ID_MUSEPACK8 CODEC_ID_MUSEPACK8
-#define AV_CODEC_ID_WMAV1 CODEC_ID_WMAV1
-#define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2
-#endif
-
 class AudioFileImpl : public AudioFile
 {
 public: