qtdemux: Add some more raw audio fourccs to the header instead of duplicating them

diff --git a/gst/isomp4/fourcc.h b/gst/isomp4/fourcc.h
index 17d31b2..6893736 100644 (file)
--- a/gst/isomp4/fourcc.h
+++ b/gst/isomp4/fourcc.h
@@ -156,7 +156,11 @@ G_BEGIN_DECLS
 #define FOURCC_ilst     GST_MAKE_FOURCC('i','l','s','t')
 #define FOURCC_ima4     GST_MAKE_FOURCC('i','m','a','4')
 #define FOURCC_imap     GST_MAKE_FOURCC('i','m','a','p')
+#define FOURCC_s16l     GST_MAKE_FOURCC('s','1','6','l')
 #define FOURCC_in24     GST_MAKE_FOURCC('i','n','2','4')
+#define FOURCC_in32     GST_MAKE_FOURCC('i','n','3','2')
+#define FOURCC_fl64     GST_MAKE_FOURCC('f','l','6','4')
+#define FOURCC_fl32     GST_MAKE_FOURCC('f','l','3','2')
 #define FOURCC_jp2c     GST_MAKE_FOURCC('j','p','2','c')
 #define FOURCC_jpeg     GST_MAKE_FOURCC('j','p','e','g')
 #define FOURCC_keyw     GST_MAKE_FOURCC('k','e','y','w')

diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index acd4ec0..c88f832 100644 (file)
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -15555,14 +15555,14 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
       stream->alignment = round_up_pow2 (stream->alignment);
       break;
     }
-    case GST_MAKE_FOURCC ('f', 'l', '6', '4'):
+    case FOURCC_fl64:
       _codec ("Raw 64-bit floating-point audio");
       caps = gst_caps_new_simple ("audio/x-raw",
           "format", G_TYPE_STRING, "F64BE",
           "layout", G_TYPE_STRING, "interleaved", NULL);
       stream->alignment = 8;
       break;
-    case GST_MAKE_FOURCC ('f', 'l', '3', '2'):
+    case FOURCC_fl32:
       _codec ("Raw 32-bit floating-point audio");
       caps = gst_caps_new_simple ("audio/x-raw",
           "format", G_TYPE_STRING, "F32BE",
@@ -15578,14 +15578,14 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
           "layout", G_TYPE_STRING, "interleaved", NULL);
       stream->alignment = 4;
       break;
-    case GST_MAKE_FOURCC ('i', 'n', '3', '2'):
+    case FOURCC_in32:
       _codec ("Raw 32-bit PCM audio");
       caps = gst_caps_new_simple ("audio/x-raw",
           "format", G_TYPE_STRING, "S32BE",
           "layout", G_TYPE_STRING, "interleaved", NULL);
       stream->alignment = 4;
       break;
-    case GST_MAKE_FOURCC ('s', '1', '6', 'l'):
+    case FOURCC_s16l:
       _codec ("Raw 16-bit PCM audio");
       caps = gst_caps_new_simple ("audio/x-raw",
           "format", G_TYPE_STRING, "S16LE",