diff options
author | wm4 <wm4@nowhere> | 2013-11-23 21:26:04 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-11-23 21:26:04 +0100 |
commit | 9f4820f6ec1721dc73335cb64b5a5e63170bf379 (patch) | |
tree | 9e65f7438d444021a32997518b328654be8e0b46 /audio/decode/ad_mpg123.c | |
parent | 0e84dafdf084c7d9da30ef7b0e0b2ca05da68157 (diff) | |
download | mpv-9f4820f6ec1721dc73335cb64b5a5e63170bf379.tar.bz2 mpv-9f4820f6ec1721dc73335cb64b5a5e63170bf379.tar.xz |
audio: remove ad_driver.preinit
This never had any real use. Get rid of dec_audio.initialized too, as
it's redundant.
Diffstat (limited to 'audio/decode/ad_mpg123.c')
-rw-r--r-- | audio/decode/ad_mpg123.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c index 8f168ebb95..aacc1cb76b 100644 --- a/audio/decode/ad_mpg123.c +++ b/audio/decode/ad_mpg123.c @@ -201,6 +201,9 @@ static int feed_new_packet(struct dec_audio *da) * erros in other places simply cannot occur. */ static int init(struct dec_audio *da, const char *decoder) { + if (!preinit(da)) + return 0; + struct ad_mpg123_context *con = da->priv; int ret; @@ -367,7 +370,6 @@ static void add_decoders(struct mp_decoder_list *list) const struct ad_functions ad_mpg123 = { .name = "mpg123", .add_decoders = add_decoders, - .preinit = preinit, .init = init, .uninit = uninit, .control = control, |