Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'

[ffmpeg] / libavformat / chromaprint.c

diff --git a/libavformat/chromaprint.c b/libavformat/chromaprint.c
index 8c9a6c011117dfaba2603f0a2b5dac52c23857ff..4da02bef7622e567d8d8190a24abbadf6da2d46f 100644 (file)
--- a/libavformat/chromaprint.c
+++ b/libavformat/chromaprint.c
@@ -39,7 +39,11 @@ typedef struct ChromaprintMuxContext {
     int silence_threshold;
     int algorithm;
     FingerprintFormat fp_format;
+#if CPR_VERSION_INT >= AV_VERSION_INT(1, 4, 0)
+    ChromaprintContext *ctx;
+#else
     ChromaprintContext ctx;
+#endif
 } ChromaprintMuxContext;
 
 static void cleanup(ChromaprintMuxContext *cpr)