diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-10 12:34:36 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-10 12:34:36 +0000 |
| commit | 10f840bd579e959bb1abe679953d836c9ff1ecd3 (patch) | |
| tree | a52fb317bfc0c8185b177dfa8a83ef532155c5d0 | |
| parent | 9bb3f3edfe9cbc0faceb0a9cf10223bb7961f830 (diff) | |
| download | ffmpeg-10f840bd579e959bb1abe679953d836c9ff1ecd3.tar.gz | |
Remove pointless #ifdefs from conditionally used files.
Originally committed as revision 19615 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/libdirac.h | 5 | ||||
| -rw-r--r-- | libavcodec/libschroedinger.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/libdirac.h b/libavcodec/libdirac.h index 0eaed6dea5..93e75d2dc6 100644 --- a/libavcodec/libdirac.h +++ b/libavcodec/libdirac.h @@ -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 */ diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h index 52793cd027..ab48cbd6c7 100644 --- a/libavcodec/libschroedinger.h +++ b/libavcodec/libschroedinger.h @@ -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_format_preset (AVCodecContext *avccontex int ff_get_schro_frame_format (SchroChromaFormat schro_chroma_fmt, SchroFrameFormat *schro_frame_fmt); -#endif /* CONFIG_LIBSCHROEDINGER */ #endif /* AVCODEC_LIBSCHROEDINGER_H */ |