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 /audio/filter/af_format.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 'audio/filter/af_format.c')
| -rw-r--r-- | audio/filter/af_format.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/filter/af_format.c b/audio/filter/af_format.c index 17af1c43c9..a51c543406 100644 --- a/audio/filter/af_format.c +++ b/audio/filter/af_format.c @@ -80,13 +80,12 @@ static int control(struct af_instance *af, int cmd, void *arg) force_out_params(af, out); if (in->nch != out->nch || in->bps != out->bps) { - mp_msg(MSGT_AFILTER, MSGL_ERR, - "[af_format] Forced input/output formats are incompatible.\n"); + MP_ERR(af, "[af_format] Forced input/output formats are incompatible.\n"); return AF_ERROR; } if (priv->fail) { - mp_msg(MSGT_AFILTER, MSGL_ERR, "[af_format] Failing on purpose.\n"); + MP_ERR(af, "[af_format] Failing on purpose.\n"); return AF_ERROR; } |