diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /libmpcodecs/ae_twolame.c | |
parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz |
Merge svn changes up to r27899
Diffstat (limited to 'libmpcodecs/ae_twolame.c')
-rw-r--r-- | libmpcodecs/ae_twolame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c index 34b5e3123e..cb0330e18c 100644 --- a/libmpcodecs/ae_twolame.c +++ b/libmpcodecs/ae_twolame.c @@ -39,7 +39,7 @@ m_option_t twolameopts_conf[] = { static int bind_twolame(audio_encoder_t *encoder, muxer_stream_t *mux_a) { - mpae_twolame_ctx *ctx = (mpae_twolame_ctx *) encoder->priv; + mpae_twolame_ctx *ctx = encoder->priv; mux_a->wf = malloc(sizeof(WAVEFORMATEX)+256); mux_a->wf->wFormatTag = 0x50; @@ -83,7 +83,7 @@ static int bind_twolame(audio_encoder_t *encoder, muxer_stream_t *mux_a) static int encode_twolame(audio_encoder_t *encoder, uint8_t *dest, void *src, int len, int max_size) { - mpae_twolame_ctx *ctx = (mpae_twolame_ctx *)encoder->priv; + mpae_twolame_ctx *ctx = encoder->priv; int ret_size = 0, r2; len /= (2*encoder->params.channels); @@ -139,7 +139,7 @@ int mpae_init_twolame(audio_encoder_t *encoder) else mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, Twolame can't encode > 2 channels, exiting\n"); - ctx = (mpae_twolame_ctx *) calloc(1, sizeof(mpae_twolame_ctx)); + ctx = calloc(1, sizeof(mpae_twolame_ctx)); if(ctx == NULL) { mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, couldn't alloc a %d bytes context, exiting\n", sizeof(mpae_twolame_ctx)); |