diff options
| author | Tal Shalif <tshalif@nargila.org> | 2008-11-23 11:14:42 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-11-23 11:14:42 +0000 |
| commit | 7b60afd805ce2da85510094f6aa4735696b4001b (patch) | |
| tree | fc7fabceb7de2f0893f55964bffc65cbac49c7dd | |
| parent | af12e9eddac1c11f030ce2cc17bd5ca5fdd2d75e (diff) | |
gst/qtdemux/qtdemux.c: Use G_{BIG,LITTLE}_ENDIAN instead of the non-GLib variants as the latter don't exist on some s...
Original commit message from CVS:
Patch by: Tal Shalif <tshalif at nargila dot org>
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Use G_{BIG,LITTLE}_ENDIAN instead of the non-GLib variants as
the latter don't exist on some systems (mingw). Fixes bug #561992.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 12 |
2 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2008-11-23 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + Patch by: Tal Shalif <tshalif at nargila dot org> + + * gst/qtdemux/qtdemux.c: (qtdemux_audio_caps): + Use G_{BIG,LITTLE}_ENDIAN instead of the non-GLib variants as + the latter don't exist on some systems (mingw). Fixes bug #561992. + 2008-11-21 Sebastian Dröge <sebastian.droege@collabora.co.uk> Patch by: Zeeshan Ali <zeeshanak at gnome dot org> diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 0876dc60..40a3cfce 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -4866,7 +4866,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, "depth", G_TYPE_INT, 8, "signed", G_TYPE_BOOLEAN, FALSE, NULL); break; case GST_MAKE_FOURCC ('t', 'w', 'o', 's'): - endian = BIG_ENDIAN; + endian = G_BIG_ENDIAN; /* fall-through */ case GST_MAKE_FOURCC ('s', 'o', 'w', 't'): { @@ -4874,7 +4874,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, gint depth; if (!endian) - endian = LITTLE_ENDIAN; + endian = G_LITTLE_ENDIAN; depth = stream->bytes_per_packet * 8; str = g_strdup_printf ("Raw %d-bit PCM audio", depth); @@ -4889,25 +4889,25 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, case GST_MAKE_FOURCC ('f', 'l', '6', '4'): _codec ("Raw 64-bit floating-point audio"); caps = gst_caps_new_simple ("audio/x-raw-float", "width", G_TYPE_INT, 64, - "endianness", G_TYPE_INT, BIG_ENDIAN, NULL); + "endianness", G_TYPE_INT, G_BIG_ENDIAN, NULL); break; case GST_MAKE_FOURCC ('f', 'l', '3', '2'): _codec ("Raw 32-bit floating-point audio"); caps = gst_caps_new_simple ("audio/x-raw-float", "width", G_TYPE_INT, 32, - "endianness", G_TYPE_INT, BIG_ENDIAN, NULL); + "endianness", G_TYPE_INT, G_BIG_ENDIAN, NULL); break; case GST_MAKE_FOURCC ('i', 'n', '2', '4'): _codec ("Raw 24-bit PCM audio"); caps = gst_caps_new_simple ("audio/x-raw-int", "width", G_TYPE_INT, 24, "depth", G_TYPE_INT, 24, - "endianness", G_TYPE_INT, BIG_ENDIAN, + "endianness", G_TYPE_INT, G_BIG_ENDIAN, "signed", G_TYPE_BOOLEAN, TRUE, NULL); break; case GST_MAKE_FOURCC ('i', 'n', '3', '2'): _codec ("Raw 32-bit PCM audio"); caps = gst_caps_new_simple ("audio/x-raw-int", "width", G_TYPE_INT, 32, "depth", G_TYPE_INT, 32, - "endianness", G_TYPE_INT, BIG_ENDIAN, + "endianness", G_TYPE_INT, G_BIG_ENDIAN, "signed", G_TYPE_BOOLEAN, TRUE, NULL); break; case GST_MAKE_FOURCC ('u', 'l', 'a', 'w'): |