mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

a52dec: Fix some merge mistakes

Browse source
This commit is contained in:
Sebastian Dröge 2012-01-10 15:25:12 +01:00
parent 31063f0098
commit 69acbc53e9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/a52dec/gsta52dec.c
View file

@ -628,7 +628,7 @@ gst_a52dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buffer)
outbuf = outbuf =
gst_buffer_new_and_alloc (256 * chans * (SAMPLE_WIDTH / 8) * num_blocks); 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; guint8 *ptr = data;
for (i = 0; i < num_blocks; i++) { 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 (n = 0; n < 256; n++) {
for (c = 0; c < chans; c++) { 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]; a52dec->samples[c * 256 + n];
} }
} }