[FFmpeg-devel] [PATCH 2/2] Remove pointless #ifndef guard, the avcodec.h inclusion guards already prevent redefinition for the contained macros.

Stefano Sabatini stefano.sabatini-lala
Sat Sep 4 12:07:26 CEST 2010


---
 libavcodec/avcodec.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9353210..17bed83 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -48,9 +48,7 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_PALETTE_CONTROL
 #define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
 #define FF_API_MM_FLAGS         (LIBAVCODEC_VERSION_MAJOR < 53)
 
 #define AV_NOPTS_VALUE          INT64_C(0x8000000000000000)
-- 
1.7.1




More information about the ffmpeg-devel mailing list