diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-10-31 07:26:40 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:07 +0200 |
| commit | 4de0369e8d6d8d497b3aa61044a152ae91d477a6 (patch) | |
| tree | c723c2a64dcba73a21af87ea7ad25cf8026b279f /mplayer.c | |
| parent | 45e1333581d9409b2d2be22129f8f6365016b609 (diff) | |
| download | mpv-4de0369e8d6d8d497b3aa61044a152ae91d477a6.tar.bz2 mpv-4de0369e8d6d8d497b3aa61044a152ae91d477a6.tar.xz | |
options: move audio_output_channels, audio_output_format to struct
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -337,7 +337,6 @@ static int softsleep=0; double force_fps=0; static int force_srate=0; -static int audio_output_format=-1; // AF_FORMAT_UNKNOWN int frame_dropping=0; // option 0=no drop 1= drop vo 2= drop decode static int play_n_frames=-1; static int play_n_frames_mf=-1; @@ -1774,7 +1773,7 @@ void reinit_audio_chain(struct MPContext *mpctx) current_module="af_preinit"; ao_data.samplerate=force_srate; ao_data.channels=0; - ao_data.format=audio_output_format; + ao_data.format = opts->audio_output_format; // first init to detect best values if(!init_audio_filters(mpctx->sh_audio, // preliminary init // input: |