[arch-commits] CVS update of extra/multimedia-plugins/gstreamer0.10-base (1 file)

[Jan de Groot]

    Date: Saturday, August 4, 2007 @ 16:35:01
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia-plugins/gstreamer0.10-base

 Removed: aac-fix.patch (1.1)

upgpkg: gstreamer0.10-base 0.10.13-1


---------------+
 aac-fix.patch |   79 --------------------------------------------------------
 1 file changed, 79 deletions(-)


Index: extra/multimedia-plugins/gstreamer0.10-base/aac-fix.patch
diff -u extra/multimedia-plugins/gstreamer0.10-base/aac-fix.patch:1.1 extra/multimedia-plugins/gstreamer0.10-base/aac-fix.patch:removed
--- extra/multimedia-plugins/gstreamer0.10-base/aac-fix.patch:1.1	Sun Oct  1 14:56:27 2006
+++ extra/multimedia-plugins/gstreamer0.10-base/aac-fix.patch	Sat Aug  4 16:35:01 2007
@@ -1,79 +0,0 @@
---- gst-libs/gst/riff/riff-ids.h	2006/08/22 15:50:36	1.19
-+++ gst-libs/gst/riff/riff-ids.h	2006/09/23 08:51:14	1.20
-@@ -304,12 +304,14 @@
- #define GST_RIFF_WAVE_FORMAT_VOXWARE_VR18   (0x0078)
- #define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ40   (0x0079)
- #define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ60   (0x0081)
-+#define GST_RIFF_WAVE_FORMAT_AAC            (0x00ff)
- #define GST_RIFF_IBM_FORMAT_MULAW           (0x0101)
- #define GST_RIFF_IBM_FORMAT_ALAW            (0x0102)
- #define GST_RIFF_IBM_FORMAT_ADPCM           (0x0103)
- #define GST_RIFF_WAVE_FORMAT_WMAV1          (0x0160)
- #define GST_RIFF_WAVE_FORMAT_WMAV2          (0x0161)
- #define GST_RIFF_WAVE_FORMAT_WMAV3          (0x0162)
-+#define GST_RIFF_WAVE_FORMAT_WMAV3_L        (0x0163)
- #define GST_RIFF_WAVE_FORMAT_SONY_ATRAC3    (0x0270)
- #define GST_RIFF_WAVE_FORMAT_A52            (0x2000)
- #define GST_RIFF_WAVE_FORMAT_DTS            (0x2001)
---- gst-libs/gst/riff/riff-media.c	2006/09/19 10:23:03	1.72
-+++ gst-libs/gst/riff/riff-media.c	2006/09/23 08:51:14	1.73
-@@ -726,7 +726,9 @@
-         gint ch = strf->channels;
-         gint ws = strf->size;
- 
--        caps = gst_caps_new_simple ("audio/x-raw-int", "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, "channels", G_TYPE_INT, ch,   /* needed for _add_layout() */
-+        caps = gst_caps_new_simple ("audio/x-raw-int",
-+            "endianness", G_TYPE_INT, G_LITTLE_ENDIAN,
-+            "channels", G_TYPE_INT, ch,
-             "width", G_TYPE_INT, (int) (ba * 8 / ch),
-             "depth", G_TYPE_INT, ws, "signed", G_TYPE_BOOLEAN, ws != 8, NULL);
- 
-@@ -879,6 +881,15 @@
-       if (codec_name)
-         *codec_name = g_strdup ("DTS audio");
-       break;
-+    case GST_RIFF_WAVE_FORMAT_AAC:
-+    {
-+      channels_max = 8;
-+      caps = gst_caps_new_simple ("audio/mpeg",
-+          "mpegversion", G_TYPE_INT, 4, NULL);
-+      if (codec_name)
-+        *codec_name = g_strdup ("MPEG-4 AAC audio");
-+      break;
-+    }
-     case GST_RIFF_WAVE_FORMAT_WMAV1:
-     case GST_RIFF_WAVE_FORMAT_WMAV2:
-     case GST_RIFF_WAVE_FORMAT_WMAV3:
-@@ -886,7 +897,6 @@
-       gint version = (codec_id - GST_RIFF_WAVE_FORMAT_WMAV1) + 1;
- 
-       channels_max = 6;
--
-       block_align = TRUE;
- 
-       caps = gst_caps_new_simple ("audio/x-wma",
-@@ -979,6 +994,8 @@
-           subformat_guid[1] == 0x41783f83 &&
-           subformat_guid[2] == 0xf0006596 && subformat_guid[3] == 0xe59262bf) {
-         caps = gst_caps_new_simple ("application/x-ogg-avi", NULL);
-+        if (codec_name)
-+          *codec_name = g_strdup ("Ogg-AVI");
-       }
- 
-       if (caps == NULL) {
-@@ -987,7 +1004,6 @@
-       }
-       break;
-     }
--
-       /* can anything decode these? pitfdll? */
-     case GST_RIFF_WAVE_FORMAT_VOXWARE:
-     case GST_RIFF_WAVE_FORMAT_VOXWARE_BYTE_ALIGNED:
-@@ -1154,6 +1170,7 @@
-     GST_RIFF_WAVE_FORMAT_VORBIS1,
-     GST_RIFF_WAVE_FORMAT_A52,
-     GST_RIFF_WAVE_FORMAT_DTS,
-+    GST_RIFF_WAVE_FORMAT_AAC,
-     GST_RIFF_WAVE_FORMAT_ALAW,
-     GST_RIFF_WAVE_FORMAT_MULAW,
-     GST_RIFF_WAVE_FORMAT_ADPCM,