gst/mpegaudioparse/gstxingmux.c: Write Xing header at the correct position in the MP3 frame for stereo files. Fixes b...

Original commit message from CVS:
* gst/mpegaudioparse/gstxingmux.c: (get_xing_offset):
Write Xing header at the correct position in the MP3 frame for
stereo files. Fixes bug #518676.

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a919e2b..82284477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-27  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst/mpegaudioparse/gstxingmux.c: (get_xing_offset):
+	Write Xing header at the correct position in the MP3 frame for
+	stereo files. Fixes bug #518676.
+
 2008-02-23  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* configure.ac:
diff --git a/common b/common
-Subproject ce296a6e04ac824523dbf7bf836f91e14012ab9
+Subproject e746d20ef536a73aea9964666c7d5f6d5c9465d
diff --git a/gst/mpegaudioparse/gstxingmux.c b/gst/mpegaudioparse/gstxingmux.c
index 10f843b1..0e957ee3 100644
--- a/gst/mpegaudioparse/gstxingmux.c
+++ b/gst/mpegaudioparse/gstxingmux.c
@@ -209,17 +209,17 @@ parse_header (guint32 header, guint * ret_size, guint * ret_spf,
 static guint
 get_xing_offset (guint32 header)
 {
-  guint mpeg_version = (header >> 19) & 3;
+  guint mpeg_version = (header >> 19) & 0x3;
   guint channel_mode = (header >> 6) & 0x3;
 
-  if (mpeg_version == 0x11) {
-    if (channel_mode == 0x11) {
+  if (mpeg_version == 0x3) {
+    if (channel_mode == 0x3) {
       return 0x11;
     } else {
       return 0x20;
     }
   } else {
-    if (channel_mode == 0x11) {
+    if (channel_mode == 0x3) {
       return 0x09;
     } else {
       return 0x11;