diff options
| author | Max Kellermann <max@duempel.org> | 2011-08-24 01:47:10 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-08-24 01:47:10 +0200 |
| commit | 5ecb6fecc478733622aa33aaf4e6997f618bd006 (patch) | |
| tree | 8a022436fa867d45f6026ccf8a629d99604da1ac /src/decoder | |
| parent | eea726740bf222a92885b0f3c3c1255a5b04cd01 (diff) | |
| parent | b3df4dc2c92d27034eaf9cef52e97a6e39c77d2e (diff) | |
| download | mpd-5ecb6fecc478733622aa33aaf4e6997f618bd006.tar.gz mpd-5ecb6fecc478733622aa33aaf4e6997f618bd006.tar.xz mpd-5ecb6fecc478733622aa33aaf4e6997f618bd006.zip | |
Merge branch 'v0.16.x'
Diffstat (limited to 'src/decoder')
| -rw-r--r-- | src/decoder/mpcdec_decoder_plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoder/mpcdec_decoder_plugin.c b/src/decoder/mpcdec_decoder_plugin.c index d28c22305..f31dcdb99 100644 --- a/src/decoder/mpcdec_decoder_plugin.c +++ b/src/decoder/mpcdec_decoder_plugin.c @@ -153,7 +153,6 @@ mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is) mpc_uint32_t ret; int32_t chunk[G_N_ELEMENTS(sample_buffer)]; long bit_rate = 0; - mpc_uint32_t vbr_update_acc; mpc_uint32_t vbr_update_bits; enum decoder_command cmd = DECODE_COMMAND_NONE; @@ -243,10 +242,11 @@ mpcdec_decode(struct decoder *mpd_decoder, struct input_stream *is) decoder_seek_error(mpd_decoder); } - vbr_update_acc = 0; vbr_update_bits = 0; #ifdef MPC_IS_OLD_API + mpc_uint32_t vbr_update_acc = 0; + ret = mpc_decoder_decode(&decoder, sample_buffer, &vbr_update_acc, &vbr_update_bits); if (ret == 0 || ret == (mpc_uint32_t)-1) |