virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Fix linking when the FFM muxer/demuxer is disabled.

Browse Source 
patch by Panagiotis Issaris, takis.issaris _at_ uhasselt -dot- be

Originally committed as revision 6136 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Panagiotis Issaris 2006-08-31 01:22:03 +00:00 committed by Diego Biurrun
parent fe84b3f091
commit e8a42081d2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffmpeg.c
View File

@ -3573,7 +3573,9 @@ static int64_t getutime(void)
}
#endif
#if defined(CONFIG_FFM_DEMUXER) || defined(CONFIG_FFM_MUXER)
extern int ffm_nopts;
#endif
static void show_formats(void)
{
@ -3949,9 +3951,11 @@ 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)
/* 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);