From 1f4f628a5dd00406aeb4cc8020b4fd29c15623af Mon Sep 17 00:00:00 2001
From: Sergey Scobich <sergey.scobich@gmail.com>
Date: Sun, 15 Jan 2006 20:21:48 +0000
Subject: [PATCH] gst/id3demux/id3v2frames.c: Fix compilation of id3demux when
 zlib is not present.

Original commit message from CVS:
* gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame):
Fix compilation of id3demux when zlib is not present.
(Fixes #326602; patch by: Sergey Scobich)
---
 ChangeLog                  | 6 ++++++
 gst/id3demux/id3v2frames.c | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 44ff9bc770..95ec36be36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-15  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/id3demux/id3v2frames.c: (id3demux_id3v2_parse_frame):
+	  Fix compilation of id3demux when zlib is not present.
+	  (Fixes #326602; patch by: Sergey Scobich)
+
 2006-01-15  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/esd/Makefile.am:
diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c
index 7b3b9bcf06..ed4c10421f 100644
--- a/gst/id3demux/id3v2frames.c
+++ b/gst/id3demux/id3v2frames.c
@@ -92,6 +92,7 @@ id3demux_id3v2_parse_frame (ID3TagsWorking * work)
     work->parse_size = frame_data_size;
 
   if (work->frame_flags & ID3V2_FRAME_FORMAT_COMPRESSION) {
+#ifdef HAVE_ZLIB
     uLongf destSize = work->parse_size;
     Bytef *dest, *src;
 
@@ -105,6 +106,11 @@ id3demux_id3v2_parse_frame (ID3TagsWorking * work)
       g_free (work->parse_data);
       return FALSE;
     }
+#else
+    GST_WARNING ("Compressed ID3v2 tag frame could not be decompressed"
+        " because gstid3demux was compiled without zlib support");
+    return FALSE;
+#endif
   } else {
     work->parse_data = work->hdr.frame_data;
   }