summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c4
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 <mark.nauwelaerts@collabora.co.uk>
+
+ Patch by: Thiago Sousa Santos <thiagoss at lcc dot ufcg dot edu dot br>
+
+ * gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
+ Correctly distinguish 8bit vs 16bit raw audio. Fixes #542410.
+
2008-07-08 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
* 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");