[MPlayer-cvslog] r37781 - trunk/fmt-conversion.c

[rtogni]

Author: rtogni
Date: Sun Feb 21 01:17:00 2016
New Revision: 37781

Log:
Drop useless ifdefs on LIBAVUTIL_VERSION_MICRO

LIBAVUTIL_VERSION_MICRO is always >= 100 in FFmpeg

Modified:
   trunk/fmt-conversion.c

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Sun Feb 21 01:04:42 2016	(r37780)
+++ trunk/fmt-conversion.c	Sun Feb 21 01:17:00 2016	(r37781)
@@ -59,19 +59,16 @@ static const struct {
     { IMGFMT_RGB8,       AV_PIX_FMT_BGR8 },
     { IMGFMT_RGB4,       AV_PIX_FMT_BGR4 },
     { IMGFMT_BGR8,       AV_PIX_FMT_PAL8 },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { IMGFMT_BGR32,      AV_PIX_FMT_0RGB32 },
     { IMGFMT_BGRA,       AV_PIX_FMT_BGR0 },
     { IMGFMT_RGBA,       AV_PIX_FMT_RGB0 },
     { IMGFMT_RGB64LE,    AV_PIX_FMT_RGBA64LE },
     { IMGFMT_RGB64BE,    AV_PIX_FMT_RGBA64BE },
-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
     { IMGFMT_XYZ12LE,    AV_PIX_FMT_XYZ12LE },
     { IMGFMT_XYZ12BE,    AV_PIX_FMT_XYZ12BE },
     { IMGFMT_422A,       AV_PIX_FMT_YUVA422P },
     { IMGFMT_444A,       AV_PIX_FMT_YUVA444P },
     { IMGFMT_GBR24P,     AV_PIX_FMT_GBRP },
-#if LIBAVUTIL_VERSION_MICRO >= 100
     { IMGFMT_GBR12PLE,   AV_PIX_FMT_GBRP12LE },
     { IMGFMT_GBR12PBE,   AV_PIX_FMT_GBRP12BE },
     { IMGFMT_GBR14PLE,   AV_PIX_FMT_GBRP14LE },
@@ -89,7 +86,6 @@ static const struct {
     { IMGFMT_444P12_LE,  AV_PIX_FMT_YUV444P12LE },
     { IMGFMT_444P12_BE,  AV_PIX_FMT_YUV444P12BE },
     { IMGFMT_Y8A,        AV_PIX_FMT_GRAY8A },
-#endif /* LIBAVUTIL_VERSION_MICRO >= 100 */
     { IMGFMT_Y16_LE,     AV_PIX_FMT_GRAY16LE },
     { IMGFMT_Y16_BE,     AV_PIX_FMT_GRAY16BE },
     { IMGFMT_YUY2,       AV_PIX_FMT_YUYV422 },