[MPlayer-cvslog] r37792 - in trunk/libmpdemux: demux_lavf.c mp_taglists.c

rtogni subversion at mplayerhq.hu
Sun Feb 21 23:27:41 CET 2016


Author: rtogni
Date: Sun Feb 21 23:27:41 2016
New Revision: 37792

Log:
Drop more useless ifdefs on LIBAVUTIL_VERSION_MICRO  

LIBAVUTIL_VERSION_MICRO is always >= 100 in FFmpeg

Reported by Ingo

Modified:
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Sun Feb 21 19:26:06 2016	(r37791)
+++ trunk/libmpdemux/demux_lavf.c	Sun Feb 21 23:27:41 2016	(r37792)
@@ -444,17 +444,13 @@ static void handle_stream(demuxer_t *dem
             sh_sub_t* sh_sub;
             char type;
             if (codec->codec_id == AV_CODEC_ID_TEXT
-#if LIBAVUTIL_VERSION_MICRO >= 100
                 || codec->codec_id == AV_CODEC_ID_SUBRIP
-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
                 )
                 type = 't';
             else if (codec->codec_id == AV_CODEC_ID_MOV_TEXT)
                 type = 'm';
             else if (codec->codec_id == AV_CODEC_ID_SSA
-#if LIBAVUTIL_VERSION_MICRO >= 100
                      || codec->codec_id == AV_CODEC_ID_ASS
-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
                 )
                 type = 'a';
             else if (codec->codec_id == AV_CODEC_ID_DVD_SUBTITLE)
@@ -467,10 +463,8 @@ static void handle_stream(demuxer_t *dem
                 type = 'd';
             else if (codec->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE)
                 type = 'p';
-#if LIBAVUTIL_VERSION_MICRO >= 100
             else if (codec->codec_id == AV_CODEC_ID_EIA_608)
                 type = 'c';
-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
             else if(codec->codec_tag == MKTAG('c', '6', '0', '8'))
                 type = 'c';
             else

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sun Feb 21 19:26:06 2016	(r37791)
+++ trunk/libmpdemux/mp_taglists.c	Sun Feb 21 23:27:41 2016	(r37792)
@@ -35,10 +35,8 @@ static const struct AVCodecTag mp_wav_ta
     { AV_CODEC_ID_ADPCM_4XM,         MKTAG('4', 'X', 'M', 'A') },
     { AV_CODEC_ID_ADPCM_ADX,         MKTAG('S', 'a', 'd', 'x') },
     { AV_CODEC_ID_ADPCM_AICA,        MKTAG('A', 'I', 'C', 'A') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ADPCM_AFC,         MKTAG('A', 'F', 'C', ' ') },
     { AV_CODEC_ID_ADPCM_DTK,         MKTAG('D', 'T', 'K', ' ') },
-#endif
     { AV_CODEC_ID_ADPCM_IMA_APC,     MKTAG('A', 'P', 'C', 'A') },
     { AV_CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A') },
     { AV_CODEC_ID_ADPCM_EA_R1,       MKTAG('E', 'A', 'R', '1') },
@@ -54,9 +52,7 @@ static const struct AVCodecTag mp_wav_ta
     { AV_CODEC_ID_ADPCM_SBPRO_3,     0x3353 },
     { AV_CODEC_ID_ADPCM_SBPRO_4,     0x3453 },
     { AV_CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ADPCM_THP_LE,      MKTAG('T', 'H', 'P', 'L') },
-#endif
     { AV_CODEC_ID_ADPCM_XA,          MKTAG('P', 'S', 'X', 'A') },
     { AV_CODEC_ID_AMR_NB,            MKTAG('n', 'b',   0,   0) },
     { AV_CODEC_ID_ATRAC1,            MKTAG('A', 'T', 'R', '1') },
@@ -71,10 +67,8 @@ static const struct AVCodecTag mp_wav_ta
     { AV_CODEC_ID_DSICINAUDIO,       MKTAG('D', 'C', 'I', 'A') },
     { AV_CODEC_ID_DSS_SP,            MKTAG('D', 'S', 'S', 's') },
     { AV_CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_EVRC,              MKTAG('s', 'e', 'v', 'c') },
     { AV_CODEC_ID_FFWAVESYNTH,       MKTAG('F', 'F', 'W', 'S') },
-#endif
     { AV_CODEC_ID_G723_1,            MKTAG('7', '2', '3', '1') },
     { AV_CODEC_ID_INTERPLAY_ACM,     0x97280301 },
     { AV_CODEC_ID_INTERPLAY_DPCM,    MKTAG('I', 'N', 'P', 'A') },
@@ -98,9 +92,7 @@ static const struct AVCodecTag mp_wav_ta
     { AV_CODEC_ID_TAK,               MKTAG('T', 'A', 'K', ' ') },
     { AV_CODEC_ID_TTA,               MKTAG('T', 'T', 'A', '1') },
     { AV_CODEC_ID_TWINVQ,            MKTAG('T', 'W', 'I', '2') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ADPCM_VIMA,        MKTAG('V', 'I', 'M', 'A') },
-#endif
     { AV_CODEC_ID_VMDAUDIO,          MKTAG('V', 'M', 'D', 'A') },
     { AV_CODEC_ID_WAVPACK,           MKTAG('W', 'V', 'P', 'K') },
     { AV_CODEC_ID_WESTWOOD_SND1,     MKTAG('S', 'N', 'D', '1') },
@@ -118,30 +110,22 @@ static const struct AVCodecTag mp_codeci
     { AV_CODEC_ID_ADPCM_G722,        0x28f },
     { AV_CODEC_ID_ADPCM_IMA_EA_SEAD, MKTAG('S', 'E', 'A', 'D') },
     { AV_CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ATRAC3P,           0xE923AABF},
-#endif
     { AV_CODEC_ID_CPIA,              MKTAG('C', 'P', 'i', 'A') },
     { AV_CODEC_ID_DTS,               0x2001 },
     { AV_CODEC_ID_DVVIDEO,           MKTAG('d', 'v', 's', 'd') },
     { AV_CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3') },
     { AV_CODEC_ID_ESCAPE124,         MKTAG('E', '1', '2', '4') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ESCAPE130,         MKTAG('E', '1', '3', '0') },
-#endif
     { AV_CODEC_ID_FLV1,              MKTAG('F', 'L', 'V', '1') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_ADPCM_G726LE,      MKTAG('6', '2', '7', 'G') },
-#endif
     { AV_CODEC_ID_G729,              MKTAG('G', '7', '2', '9') },
     { AV_CODEC_ID_H264,              MKTAG('H', '2', '6', '4') },
     { AV_CODEC_ID_HEVC,              MKTAG('H', 'E', 'V', 'C') },
     { AV_CODEC_ID_MP3,               0x55 },
     { AV_CODEC_ID_MPEG4,             MKTAG('M', 'P', '4', 'V') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_PAF_AUDIO,         MKTAG('P', 'A', 'F', 'A') },
     { AV_CODEC_ID_PAF_VIDEO,         MKTAG('P', 'A', 'F', 'V') },
-#endif
     { AV_CODEC_ID_PCM_BLURAY,        MKTAG('B', 'P', 'C', 'M') },
     { AV_CODEC_ID_PCM_S8,            MKTAG('t', 'w', 'o', 's') },
     { AV_CODEC_ID_PCM_U8,            1 },
@@ -181,9 +165,7 @@ static const struct AVCodecTag mp_bmp_ta
     { AV_CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V') },
     { AV_CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1') },
     { AV_CODEC_ID_FLIC,              MKTAG('f', 'l', 'i', 'c') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_HEVC,              MKTAG('H', 'E', 'V', 'C') },
-#endif
     { AV_CODEC_ID_HNM4_VIDEO,        MKTAG('H', 'N', 'M', '4') },
     { AV_CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I') },
     { AV_CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V') },
@@ -192,10 +174,8 @@ static const struct AVCodecTag mp_bmp_ta
     { AV_CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C') },
     { AV_CODEC_ID_MMVIDEO,           MKTAG('M', 'M', 'V', ' ') },
     { AV_CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_MVC1,              MKTAG('m', 'v', 'c', '1') },
     { AV_CODEC_ID_MVC2,              MKTAG('m', 'v', 'c', '2') },
-#endif
     { AV_CODEC_ID_MXPEG,             MKTAG('M', 'X', 'P', 'G') },
     { AV_CODEC_ID_NUV,               MKTAG('N', 'U', 'V', '1') },
     { AV_CODEC_ID_APNG,              MKTAG('a', 'p', 'n', 'g') },
@@ -205,10 +185,8 @@ static const struct AVCodecTag mp_bmp_ta
     { AV_CODEC_ID_RV20,              MKTAG('R', 'V', '2', '0') },
     { AV_CODEC_ID_RV30,              MKTAG('R', 'V', '3', '0') },
     { AV_CODEC_ID_RV40,              MKTAG('R', 'V', '4', '0') },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { AV_CODEC_ID_SANM,              MKTAG('S', 'A', 'N', 'M') },
     { AV_CODEC_ID_SGIRLE,            MKTAG('r', 'l', 'e', '1') },
-#endif
     { AV_CODEC_ID_SVQ3,              MKTAG('S', 'V', 'Q', '3') },
     { AV_CODEC_ID_TMV,               MKTAG('t', 'm', 'v', '8') },
     { AV_CODEC_ID_TGV,               MKTAG('f', 'V', 'G', 'T') },


More information about the MPlayer-cvslog mailing list