summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-09-05 21:04:11 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-09-05 21:04:11 +0000
commit8ef38f3f5030a7a1b7eab0a464d7fb36c6dbe565 (patch)
treeb03b64c99f6739cc2d3bb541d6a013c3586be207 /libavcodec
parentb1c32fb5e5e9f6d18077b4f4d6fb7e6fd946630c (diff)
Add #ifndef around FF_API_MM_FLAGS.
The #ifndef is required to allow for example some automated regression tests by simply configuring with: --extra-cflags="-DFF_API_FOO=0". Originally committed as revision 25043 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 935321079c..f397ad4486 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -51,7 +51,9 @@
#ifndef FF_API_PALETTE_CONTROL
#define FF_API_PALETTE_CONTROL (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
+#ifndef FF_API_MM_FLAGS
#define FF_API_MM_FLAGS (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000