Remove pointless #ifdefs from conditionally used files.
Originally committed as revision 19615 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9bb3f3edfe
commit
10f840bd57
@ -26,10 +26,6 @@
|
|||||||
#ifndef AVCODEC_LIBDIRAC_H
|
#ifndef AVCODEC_LIBDIRAC_H
|
||||||
#define AVCODEC_LIBDIRAC_H
|
#define AVCODEC_LIBDIRAC_H
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#if CONFIG_LIBDIRAC
|
|
||||||
|
|
||||||
#include "avcodec.h"
|
#include "avcodec.h"
|
||||||
#include <libdirac_common/dirac_types.h>
|
#include <libdirac_common/dirac_types.h>
|
||||||
|
|
||||||
@ -45,5 +41,4 @@ static const struct {
|
|||||||
{ PIX_FMT_YUV444P, format444 },
|
{ PIX_FMT_YUV444P, format444 },
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* CONFIG_LIBDIRAC */
|
|
||||||
#endif /* AVCODEC_LIBDIRAC_H */
|
#endif /* AVCODEC_LIBDIRAC_H */
|
||||||
|
@ -26,10 +26,6 @@
|
|||||||
#ifndef AVCODEC_LIBSCHROEDINGER_H
|
#ifndef AVCODEC_LIBSCHROEDINGER_H
|
||||||
#define AVCODEC_LIBSCHROEDINGER_H
|
#define AVCODEC_LIBSCHROEDINGER_H
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#if CONFIG_LIBSCHROEDINGER
|
|
||||||
|
|
||||||
#include <schroedinger/schrobitstream.h>
|
#include <schroedinger/schrobitstream.h>
|
||||||
#include <schroedinger/schroframe.h>
|
#include <schroedinger/schroframe.h>
|
||||||
#include "avcodec.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,
|
int ff_get_schro_frame_format (SchroChromaFormat schro_chroma_fmt,
|
||||||
SchroFrameFormat *schro_frame_fmt);
|
SchroFrameFormat *schro_frame_fmt);
|
||||||
|
|
||||||
#endif /* CONFIG_LIBSCHROEDINGER */
|
|
||||||
#endif /* AVCODEC_LIBSCHROEDINGER_H */
|
#endif /* AVCODEC_LIBSCHROEDINGER_H */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user