From 418a0b9fc4d73a968b4a20d1c43c1be469b3b688 Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Sat, 31 May 2008 14:22:30 +0000
Subject: [PATCH] Compiling ffmpeg.c fails when when the .ffm demuxer is
 enabled, but the .ffm muxer is disabled. The cause is an incorrect #ifdef
 that assumes that the ffm_nopts symbol (global define in ffmenc) is present
 when either ffm muxer OR demuxer is enabled. patch by Peter Ross, pross xvid
 org

Originally committed as revision 13573 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 15aae25a38..9ede595dc6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2210,7 +2210,7 @@ static int opt_default(const char *opt, const char *arg){
     opt_names= av_realloc(opt_names, sizeof(void*)*(opt_name_count+1));
     opt_names[opt_name_count++]= o->name;
 
-#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER)
+#ifdef CONFIG_FFM_MUXER
     /* disable generate of real time pts in ffm (need to be supressed anyway) */
     if(avctx_opts[0]->flags & CODEC_FLAG_BITEXACT)
         ffm_nopts = 1;