Changeset 489

Timestamp:

01/13/16 00:33:48 (9 years ago)

Author:

r2d

Message:

mpc2sv8 : fix a segfault caused by commit r476

Location:

libmpc/trunk

Files:

• include/mpc/mpcdec.h (modified) (1 diff)
• libmpcdec/mpc_demux.c (modified) (1 diff)
• mpc2sv8/mpc2sv8.c (modified) (1 diff)

libmpc/trunk/include/mpc/mpcdec.h

@@ -117 +117 @@
 /// decode frame
 MPC_API mpc_status mpc_demux_decode(mpc_demux * d, mpc_frame_info * i);
+/// decode frame : use mpc_demux_decode() instead. This function is only used by mpc2sv8.
+MPC_API mpc_status mpc_demux_decode_inner(mpc_demux * d, mpc_frame_info * i);
 /// get streaminfo
 MPC_API void mpc_demux_get_info(mpc_demux * d, mpc_streaminfo * i);

libmpc/trunk/libmpcdec/mpc_demux.c

@@ -567 +567 @@
 }
 
-static mpc_status mpc_demux_decode_inner(mpc_demux * d, mpc_frame_info * i)
+mpc_status mpc_demux_decode_inner(mpc_demux * d, mpc_frame_info * i)
 {
         mpc_bits_reader r;

libmpc/trunk/mpc2sv8/mpc2sv8.c

@@ -163 +163 @@
 
                 demux->d->samples_to_skip = MPC_FRAME_LENGTH + MPC_DECODER_SYNTH_DELAY;
-                err = mpc_demux_decode(demux, &frame);
-
-                if(frame.bits == -1) break;
+        err = mpc_demux_decode_inner(demux, &frame);
+
+        if (MPC_IS_FAILURE(err) || frame.bits == -1) break;
 
                 datacpy(demux->d, &e);