diff options
author | Peter Ross <pross@xvid.org> | 2008-05-31 18:22:30 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2008-05-31 18:22:30 +0400 |
commit | 418a0b9fc4d73a968b4a20d1c43c1be469b3b688 (patch) | |
tree | 39f05ee7f5f4e4724be8f8d89878c3f5b436f9b8 /ffmpeg.c | |
parent | b13ddb3bcad76e3a04391f417e7030774eea4037 (diff) |
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
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |