diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 15:25:12 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 15:25:12 +0100 |
commit | 69acbc53e960310c51392551fc3f14d9573dc184 (patch) | |
tree | 3da0d2619d1fa9df5cc4d866ff8ce637500c61b6 | |
parent | 31063f009861415c45bbaf16c5970a45cedde81b (diff) |
a52dec: Fix some merge mistakes
-rw-r--r-- | ext/a52dec/gsta52dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c index eef9088e..25043a5f 100644 --- a/ext/a52dec/gsta52dec.c +++ b/ext/a52dec/gsta52dec.c @@ -628,7 +628,7 @@ gst_a52dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer) outbuf = gst_buffer_new_and_alloc (256 * chans * (SAMPLE_WIDTH / 8) * num_blocks); - data = gst_buffer_map (buffer, &size, NULL, GST_MAP_WRITE); + data = gst_buffer_map (outbuf, &size, NULL, GST_MAP_WRITE); { guint8 *ptr = data; for (i = 0; i < num_blocks; i++) { @@ -646,7 +646,7 @@ gst_a52dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer) for (n = 0; n < 256; n++) { for (c = 0; c < chans; c++) { - ((sample_t *) ptr)[reorder_map[n] * chans + c] = + ((sample_t *) ptr)[n * chans + reorder_map[c]] = a52dec->samples[c * 256 + n]; } } |