Mercurial > mplayer.hg

changeset 35718:821decdd28ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fmt-conversion: Fix PIX_FMT availability ifdefs to work as expected.
author diego
date Mon, 21 Jan 2013 23:05:12 +0000
parents 42ca1c165174
children a11fa641a711
files fmt-conversion.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/fmt-conversion.c	Mon Jan 21 20:18:16 2013 +0000
+++ b/fmt-conversion.c	Mon Jan 21 23:05:12 2013 +0000
@@ -57,19 +57,17 @@
     { 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 @@
     { 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 },