summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/metadata/metadataparsejpeg.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fbc9dc4..f2ed7780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-01-31 Wim Taymans <wim.taymans@collabora.co.uk>
+ * ext/metadata/metadataparsejpeg.c: (metadataparse_jpeg_reading):
+ Fix compilation.
+
+2008-01-31 Wim Taymans <wim.taymans@collabora.co.uk>
+
* gst-libs/gst/app/gstappsink.c: (gst_app_sink_dispose):
Really clean up the queue instead of just unreffing all buffers
in it.
diff --git a/ext/metadata/metadataparsejpeg.c b/ext/metadata/metadataparsejpeg.c
index f716d778..480de563 100644
--- a/ext/metadata/metadataparsejpeg.c
+++ b/ext/metadata/metadataparsejpeg.c
@@ -383,7 +383,9 @@ metadataparse_jpeg_reading (JpegParseData * jpeg_data, guint8 ** buf,
static const char JfifHeader[] = "JFIF";
static const unsigned char ExifHeader[] =
{ 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 };
+#ifdef HAVE_IPTC
static const char PhotoshopHeader[] = "Photoshop 3.0";
+#endif
static const char XmpHeader[] = "http://ns.adobe.com/xap/1.0/";
*next_start = *buf;