[FFmpeg-cvslog] clenaup: #ifdec CONFIG*
Michael Niedermayer
git at videolan.org
Tue Dec 13 22:09:39 CET 2011
ffmpeg | branch: release/0.9 | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 13 20:53:21 2011 +0100| [657737e58d65a1f1c10f1059231592a0a9ad652e] | committer: Michael Niedermayer
clenaup: #ifdec CONFIG*
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit b39e01a6e887745192da8c105ffac1f297b00da9)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=657737e58d65a1f1c10f1059231592a0a9ad652e
---
libavcodec/rv34_parser.c | 4 ++--
libavformat/bit.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/rv34_parser.c b/libavcodec/rv34_parser.c
index 4c1d2e3..9672f26 100644
--- a/libavcodec/rv34_parser.c
+++ b/libavcodec/rv34_parser.c
@@ -76,7 +76,7 @@ static int rv34_parse(AVCodecParserContext *s,
return buf_size;
}
-#ifdef CONFIG_RV30_PARSER
+#if CONFIG_RV30_PARSER
AVCodecParser ff_rv30_parser = {
.codec_ids = { CODEC_ID_RV30 },
.priv_data_size = sizeof(RV34ParseContext),
@@ -84,7 +84,7 @@ AVCodecParser ff_rv30_parser = {
};
#endif
-#ifdef CONFIG_RV40_PARSER
+#if CONFIG_RV40_PARSER
AVCodecParser ff_rv40_parser = {
.codec_ids = { CODEC_ID_RV40 },
.priv_data_size = sizeof(RV34ParseContext),
diff --git a/libavformat/bit.c b/libavformat/bit.c
index 3449ce1..1249ea1 100644
--- a/libavformat/bit.c
+++ b/libavformat/bit.c
@@ -113,7 +113,7 @@ AVInputFormat ff_bit_demuxer = {
.extensions = "bit",
};
-#ifdef CONFIG_MUXERS
+#if CONFIG_MUXERS
static int write_header(AVFormatContext *s)
{
AVCodecContext *enc = s->streams[0]->codec;
More information about the ffmpeg-cvslog
mailing list