[FFmpeg-cvslog] r13573 - trunk/ffmpeg.c

[diego]

Author: diego
Date: Sat May 31 16:22:30 2008
New Revision: 13573

Log:
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


Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Sat May 31 16:22:30 2008
@@ -2210,7 +2210,7 @@ static int opt_default(const char *opt, 
     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;