generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compiling ffmpeg.c fails when when the .ffm demuxer is enabled, but the .ffm

Browse Source 
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
This commit is contained in:
Peter Ross 2008-05-31 14:22:30 +00:00 committed by Diego Biurrun
parent b13ddb3bca
commit 418a0b9fc4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -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;