diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 20:48:17 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-21 20:48:17 +0000 |
| commit | 2b50b7ddab6524345ace4e75a0b476bedf3a9c8a (patch) | |
| tree | b628dffa4b7e470d2400efe716ff736abca2b846 /mencoder.c | |
| parent | 033fc8c6dd130df730215da4f2f78033153f3033 (diff) | |
| download | mpv-2b50b7ddab6524345ace4e75a0b476bedf3a9c8a.tar.bz2 mpv-2b50b7ddab6524345ace4e75a0b476bedf3a9c8a.tar.xz | |
Make compilation depending on USE_SUB unconditional.
USE_SUB was hardcoded to true in configure, manually turning it off
would break compilation, and there's no apparent reason why having all
subtitle code under #ifdefs (even working ones) would be worth the
clutter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21156 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mencoder.c b/mencoder.c index 472a1ef3bb..b7c2c25e8c 100644 --- a/mencoder.c +++ b/mencoder.c @@ -199,10 +199,8 @@ int sub_auto = 0; int subcc_enabled=0; int suboverlap_enabled = 1; -#ifdef USE_SUB static sub_data* subdata=NULL; float sub_last_pts = -303; -#endif int auto_expand=1; int encode_duplicates=1; @@ -649,7 +647,6 @@ if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf || playback_spee } } -#ifdef USE_SUB // after reading video params we should load subtitles because // we know fps so now we can adjust subtitles time to ~6 seconds AST // check .sub @@ -669,7 +666,6 @@ if(sh_audio && (out_audio_codec || seek_to_sec || !sh_audio->wf || playback_spee free(tmp[i++]); free(tmp); } -#endif // set up video encoder: @@ -1477,7 +1473,6 @@ if(sh_audio && !demuxer2){ } fflush(stdout); -#ifdef USE_SUB // find sub if(subdata && sh_video->pts>0){ float pts=sh_video->pts; @@ -1489,7 +1484,6 @@ if(sh_audio && !demuxer2){ sub_last_pts = pts; } } -#endif #ifdef USE_DVDREAD // DVD sub: |