[FFmpeg-cvslog] r19615 - in trunk/libavcodec: libdirac.h libschroedinger.h

diego subversion
Mon Aug 10 14:34:37 CEST 2009


Author: diego
Date: Mon Aug 10 14:34:36 2009
New Revision: 19615

Log:
Remove pointless #ifdefs from conditionally used files.

Modified:
   trunk/libavcodec/libdirac.h
   trunk/libavcodec/libschroedinger.h

Modified: trunk/libavcodec/libdirac.h
==============================================================================
--- trunk/libavcodec/libdirac.h	Mon Aug 10 10:18:05 2009	(r19614)
+++ trunk/libavcodec/libdirac.h	Mon Aug 10 14:34:36 2009	(r19615)
@@ -26,10 +26,6 @@
 #ifndef AVCODEC_LIBDIRAC_H
 #define AVCODEC_LIBDIRAC_H
 
-#include "config.h"
-
-#if CONFIG_LIBDIRAC
-
 #include "avcodec.h"
 #include <libdirac_common/dirac_types.h>
 
@@ -45,5 +41,4 @@ static const struct {
     { PIX_FMT_YUV444P, format444 },
 };
 
-#endif /* CONFIG_LIBDIRAC */
 #endif /* AVCODEC_LIBDIRAC_H */

Modified: trunk/libavcodec/libschroedinger.h
==============================================================================
--- trunk/libavcodec/libschroedinger.h	Mon Aug 10 10:18:05 2009	(r19614)
+++ trunk/libavcodec/libschroedinger.h	Mon Aug 10 14:34:36 2009	(r19615)
@@ -26,10 +26,6 @@
 #ifndef AVCODEC_LIBSCHROEDINGER_H
 #define AVCODEC_LIBSCHROEDINGER_H
 
-#include "config.h"
-
-#if CONFIG_LIBSCHROEDINGER
-
 #include <schroedinger/schrobitstream.h>
 #include <schroedinger/schroframe.h>
 #include "avcodec.h"
@@ -57,5 +53,4 @@ SchroVideoFormatEnum ff_get_schro_video_
 int ff_get_schro_frame_format (SchroChromaFormat schro_chroma_fmt,
                                SchroFrameFormat  *schro_frame_fmt);
 
-#endif /* CONFIG_LIBSCHROEDINGER */
 #endif /* AVCODEC_LIBSCHROEDINGER_H */



More information about the ffmpeg-cvslog mailing list