Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/libexif/IptcParse.h b/lib/libexif/IptcParse.h
new file mode 100644
index 0000000000..e175ef769f
--- /dev/null
+++ b/lib/libexif/IptcParse.h
@@ -0,0 +1,12 @@
+#ifndef __IPTC_PARSE_H
+#define __IPTC_PARSE_H
+
+#include "libexif.h"
+
+class CIptcParse
+{
+  public:
+    static bool Process(const unsigned char* const Data, const unsigned short length, IPTCInfo_t *info);
+};
+
+#endif      // __IPTC_H