[FFmpeg-cvslog] Move some conditionally used code below the appropriate #ifdef.

Diego Biurrun git at videolan.org
Mon Jul 4 00:53:47 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sun Jul  3 16:57:26 2011 +0200| [91c9aa0941869531ce8cadbea8cd333a9c4b1244] | committer: Diego Biurrun

Move some conditionally used code below the appropriate #ifdef.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91c9aa0941869531ce8cadbea8cd333a9c4b1244
---

 libavformat/asfdec.c |    4 +---
 libavutil/des.c      |    2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 16bba93..4fafb26 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -84,13 +84,11 @@ static const ff_asf_guid index_guid = {
     0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb
 };
 
+#ifdef DEBUG
 static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
     0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2
 };
-/**********************************/
-/* decoding */
 
-#ifdef DEBUG
 #define PRINT_IF_GUID(g,cmp) \
 if (!ff_guidcmp(g, &cmp)) \
     av_dlog(NULL, "(GUID: %s) ", #cmp)
diff --git a/libavutil/des.c b/libavutil/des.c
index 857ca91..5de8163 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -39,6 +39,7 @@ static const uint8_t IP_shuffle[] = {
 };
 #undef T
 
+#if defined(CONFIG_SMALL) || defined(GENTABLES)
 #define T(a, b, c, d) 32-a,32-b,32-c,32-d
 static const uint8_t P_shuffle[] = {
     T(16,  7, 20, 21),
@@ -51,6 +52,7 @@ static const uint8_t P_shuffle[] = {
     T(22, 11,  4, 25)
 };
 #undef T
+#endif
 
 #define T(a, b, c, d, e, f, g) 64-a,64-b,64-c,64-d,64-e,64-f,64-g
 static const uint8_t PC1_shuffle[] = {



More information about the ffmpeg-cvslog mailing list