[MPlayer-cvslog] r34499 - trunk/libmpdemux/mp_taglists.c

[siretart]

Author: siretart
Date: Wed Jan  4 13:33:59 2012
New Revision: 34499

Log:
make the checks for available codec id more robust

prefer the use of LIBAVUTIL_VERSION_MICRO over defines from config.h

Modified:
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Wed Jan  4 11:39:38 2012	(r34498)
+++ trunk/libmpdemux/mp_taglists.c	Wed Jan  4 13:33:59 2012	(r34499)
@@ -43,7 +43,7 @@ static const struct AVCodecTag mp_wav_ta
     { CODEC_ID_COOK,              MKTAG('c', 'o', 'o', 'k')},
     { CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
-#ifdef CONFIG_FFWAVESYNTH_DECODER
+#ifdef LIBAVUTIL_VERSION_MICRO >= 100
     { CODEC_ID_FFWAVESYNTH,       MKTAG('F', 'F', 'W', 'S')},
 #endif
     { CODEC_ID_G723_1,            MKTAG('7', '2', '3', '1')},
@@ -87,7 +87,7 @@ static const struct AVCodecTag mp_codeci
     { CODEC_ID_DVVIDEO,           MKTAG('d', 'v', 's', 'd')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
     { CODEC_ID_ESCAPE124,         MKTAG('E', '1', '2', '4')},
-#ifdef CONFIG_ESCAPE130_DECODER
+#ifdef LIBAVUTIL_VERSION_MICRO >= 100
     { CODEC_ID_ESCAPE130,         MKTAG('E', '1', '3', '0')},
 #endif
     { CODEC_ID_FLV1,              MKTAG('F', 'L', 'V', '1')},