diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-08-21 18:52:31 +0300 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:04:46 +0200 |
| commit | 435d7c97c900a53adedcca32b07bb4a9a5f890d3 (patch) | |
| tree | 24734f7004cfc6da51b1b60b5e850449e32b7f7c /libmpcodecs | |
| parent | d21b109bf7d3f36c13298d794c856eff834946c3 (diff) | |
| download | mpv-435d7c97c900a53adedcca32b07bb4a9a5f890d3.tar.bz2 mpv-435d7c97c900a53adedcca32b07bb4a9a5f890d3.tar.xz | |
cleanup: remove pointless #defines
Remove the following #defines, which should never change in practice:
CONFIG_FAKE_MONO, OUTBURST, FAST_OSD, FAST_OSD_TABLE
The configure script hardcoded these to particular values in config.h.
They could only be changed by manually editing it. I don't think
anyone would want to.
X11_FULLSCREEN
This once did something, but became meaningless years ago and was now
always set to true if the files using it were compiled at all.
Conflicts:
configure
libvo/osd.c
libvo/vo_gl.c
Merged from mplayer2. The OSD defines were already removed in this fork.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ad_mpg123.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/dec_audio.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/libmpcodecs/ad_mpg123.c b/libmpcodecs/ad_mpg123.c index 21173a8a8f..7450b55c25 100644 --- a/libmpcodecs/ad_mpg123.c +++ b/libmpcodecs/ad_mpg123.c @@ -93,14 +93,12 @@ static int preinit(sh_audio_t *sh) if (!con->handle) goto bad_end; -#ifdef CONFIG_FAKE_MONO /* Guessing here: Default value triggers forced upmix of mono to stereo. */ flag = fakemono == 0 ? MPG123_FORCE_STEREO : fakemono == 1 ? MPG123_MONO_LEFT : fakemono == 2 ? MPG123_MONO_RIGHT : 0; if (mpg123_param(con->handle, MPG123_ADD_FLAGS, flag, 0.0) != MPG123_OK) goto bad_end; -#endif /* Basic settings. * Don't spill messages, enable better resync with non-seekable streams. diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 5a77dfe6d1..c089d94691 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -37,9 +37,7 @@ #include "libaf/af.h" -#ifdef CONFIG_FAKE_MONO int fakemono = 0; -#endif af_cfg_t af_cfg = { 1, NULL }; // Configuration for audio filters |