diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
| commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
| tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /player/audio.c | |
| parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
| parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
| download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz | |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'player/audio.c')
| -rw-r--r-- | player/audio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/player/audio.c b/player/audio.c index ab91834aa8..64160e0cd7 100644 --- a/player/audio.c +++ b/player/audio.c @@ -114,6 +114,8 @@ void reinit_audio_chain(struct MPContext *mpctx) mpctx->initialized_flags |= INITIALIZED_ACODEC; assert(!mpctx->d_audio); mpctx->d_audio = talloc_zero(NULL, struct dec_audio); + mpctx->d_audio->log = mp_log_new(mpctx->d_audio, mpctx->log, "!ad"); + mpctx->d_audio->global = mpctx->global; mpctx->d_audio->opts = opts; mpctx->d_audio->header = sh; if (!audio_init_best_codec(mpctx->d_audio, opts->audio_decoders)) |