commit a58cec94dc5e6158f8f1f72a122541f35056cef8
parent 59780b57736385685d2f8e61b8e9f626b1755761
Author: Heikki Lindholm <holin@iki.fi>
Date: Mon, 21 Jul 2008 19:54:14 +0000
ffmpeg: aes contains mutable statics, disable it (only used by the mxf demuxer)
Diffstat:
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/plugins/thumbnailffmpeg/ffmpeg/libavutil/aes.c b/src/plugins/thumbnailffmpeg/ffmpeg/libavutil/aes.c
@@ -1,3 +1,4 @@
+#if 0
/*
* copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
*
@@ -241,3 +242,4 @@ STOP_TIMER("aes")}
return 0;
}
#endif
+#endif
diff --git a/src/plugins/thumbnailffmpeg/ffmpeg/libavutil/aes.h b/src/plugins/thumbnailffmpeg/ffmpeg/libavutil/aes.h
@@ -1,3 +1,4 @@
+#if 0
/*
* copyright (c) 2007 Michael Niedermayer <michaelni@gmx.at>
*
@@ -45,3 +46,4 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
void av_aes_crypt(struct AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt);
#endif /* FFMPEG_AES_H */
+#endif