# HG changeset patch # User siretart # Date 1325680439 0 # Node ID fb9948833d0cc2968895cefc617530a3cb08b3f4 # Parent bb440bfcade90367aaaea062c5c134eba81b5d06 make the checks for available codec id more robust prefer the use of LIBAVUTIL_VERSION_MICRO over defines from config.h diff -r bb440bfcade9 -r fb9948833d0c libmpdemux/mp_taglists.c --- a/libmpdemux/mp_taglists.c Wed Jan 04 10:39:38 2012 +0000 +++ b/libmpdemux/mp_taglists.c Wed Jan 04 12:33:59 2012 +0000 @@ -43,7 +43,7 @@ { 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 @@ { 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')},