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 /libmpcodecs/ad_liba52.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 'libmpcodecs/ad_liba52.c')
| -rw-r--r-- | libmpcodecs/ad_liba52.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index 0cc282776d..abd6a7ac54 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -141,10 +141,11 @@ static sample_t dynrng_call (sample_t c, void *data) static int preinit(sh_audio_t *sh) { + struct MPOpts *opts = sh->opts; /* Dolby AC3 audio: */ /* however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame */ if (sh->samplesize < 4) sh->samplesize = 4; - sh->audio_out_minsize=audio_output_channels*sh->samplesize*256*6; + sh->audio_out_minsize=opts->audio_output_channels*sh->samplesize*256*6; sh->audio_in_minsize=3840; a52_level = 1.0; return 1; @@ -219,7 +220,7 @@ static int init(sh_audio_t *sh_audio) /* 'a52 cannot upmix' hotfix:*/ a52_printinfo(sh_audio); - sh_audio->channels=audio_output_channels; + sh_audio->channels=opts->audio_output_channels; while(sh_audio->channels>0){ switch(sh_audio->channels){ case 1: a52_flags=A52_MONO; break; |