From a0bc9e69fe5f209e1e9a0beac29b04b020cb5657 Mon Sep 17 00:00:00 2001 From: Thiago Sousa Santos Date: Thu, 10 Jul 2008 20:47:56 +0000 Subject: gst/qtdemux/qtdemux.c: Correctly distinguish 8bit vs 16bit raw audio. Fixes #542410. Original commit message from CVS: Patch by: Thiago Sousa Santos * gst/qtdemux/qtdemux.c: (qtdemux_audio_caps): Correctly distinguish 8bit vs 16bit raw audio. Fixes #542410. --- ChangeLog | 7 +++++++ gst/qtdemux/qtdemux.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da262b4e..bb005bac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-10 Mark Nauwelaerts + + Patch by: Thiago Sousa Santos + + * gst/qtdemux/qtdemux.c: (qtdemux_audio_caps): + Correctly distinguish 8bit vs 16bit raw audio. Fixes #542410. + 2008-07-08 Mark Nauwelaerts * gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream), diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index a273bc29..d5e03825 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -4593,7 +4593,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, "width = (int) 8, " "depth = (int) 8, " "signed = (boolean) false"); break; case GST_MAKE_FOURCC ('t', 'w', 'o', 's'): - if (stream->bytes_per_frame == 1) { + if (stream->bytes_per_sample == 1) { _codec ("Raw 8-bit PCM audio"); caps = gst_caps_from_string ("audio/x-raw-int, " "width = (int) 8, " "depth = (int) 8, " "signed = (boolean) true"); @@ -4607,7 +4607,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, } break; case GST_MAKE_FOURCC ('s', 'o', 'w', 't'): - if (stream->bytes_per_frame == 1) { + if (stream->bytes_per_sample == 1) { _codec ("Raw 8-bit PCM audio"); caps = gst_caps_from_string ("audio/x-raw-int, " "width = (int) 8, " "depth = (int) 8, " "signed = (boolean) true"); -- cgit