[Ffmpeg-cvslog] r6136 - trunk/ffmpeg.c

[diego]

Author: diego
Date: Thu Aug 31 03:22:03 2006
New Revision: 6136

Modified:
   trunk/ffmpeg.c

Log:
Fix linking when the FFM muxer/demuxer is disabled.
patch by Panagiotis Issaris, takis.issaris _at_ uhasselt -dot- be


Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu Aug 31 03:22:03 2006
@@ -3573,7 +3573,9 @@
 }
 #endif
 
+#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER)
 extern int ffm_nopts;
+#endif
 
 static void show_formats(void)
 {
@@ -3949,9 +3951,11 @@
     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)
     /* disable generate of real time pts in ffm (need to be supressed anyway) */
     if(avctx_opts->flags & CODEC_FLAG_BITEXACT)
         ffm_nopts = 1;
+#endif
 
     if(avctx_opts->debug)
         av_log_set_level(AV_LOG_DEBUG);