diff options
| author | Panagiotis Issaris <takis.issaris@uhasselt.be> | 2006-08-31 01:22:03 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-08-31 01:22:03 +0000 |
| commit | e8a42081d2c94bc2abf478ca1946b4533c72bab7 (patch) | |
| tree | 6dc205b59737e6c333675af91cee3f53946b734d /ffmpeg.c | |
| parent | fe84b3f09100d5783c1ce4d3dc4dd8427cd9ba80 (diff) | |
| download | ffmpeg-e8a42081d2c94bc2abf478ca1946b4533c72bab7.tar.gz | |
Fix linking when the FFM muxer/demuxer is disabled.
patch by Panagiotis Issaris, takis.issaris _at_ uhasselt -dot- be
Originally committed as revision 6136 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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); |