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

[diego]

Author: diego
Date: Tue Jan 22 00:05:12 2013
New Revision: 35812

Log:
fmt-conversion: Fix PIX_FMT availability ifdefs to work as expected.

Modified:
   trunk/fmt-conversion.c

Modified: trunk/fmt-conversion.c
==============================================================================
--- trunk/fmt-conversion.c	Mon Jan 21 21:18:16 2013	(r35811)
+++ trunk/fmt-conversion.c	Tue Jan 22 00:05:12 2013	(r35812)
@@ -57,19 +57,17 @@ static const struct {
     { IMGFMT_RGB8,       AV_PIX_FMT_BGR8 },
     { IMGFMT_RGB4,       AV_PIX_FMT_BGR4 },
     { IMGFMT_BGR8,       AV_PIX_FMT_PAL8 },
-// NB: This works only because AV_PIX_FMT_0RGB32 is a CPP Macro.
-//     note that most other PIX_FMT values are enums
-#ifdef AV_PIX_FMT_0RGB32
+#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_422A,       AV_PIX_FMT_YUVA422P },
     { IMGFMT_444A,       AV_PIX_FMT_YUVA444P },
-#endif
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
     { 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 },
@@ -87,7 +85,7 @@ static const struct {
     { IMGFMT_444P12_LE,  AV_PIX_FMT_YUV444P12LE },
     { IMGFMT_444P12_BE,  AV_PIX_FMT_YUV444P12BE },
     { IMGFMT_Y8A,        AV_PIX_FMT_GRAY8A },
-#endif
+#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 },