Modify the ffmpeg source files in apps/codecs/libwmapro in order to compile the codec standalone.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25764 a1c6a512-1295-4272-9138-f99709370657

8 files changed, 16 insertions, 15 deletions

diff --git a/apps/codecs/libwmapro/libavutil/avutil.h b/apps/codecs/libwmapro/libavutil/avutil.h
index 1523de6753..1b858f1fe6 100644
--- a/apps/codecs/libwmapro/libavutil/avutil.h
+++ b/apps/codecs/libwmapro/libavutil/avutil.h
@@ -81,9 +81,9 @@ enum AVMediaType {
 #include "common.h"
 #include "error.h"
 #include "mathematics.h"
-#include "rational.h"
-#include "intfloat_readwrite.h"
+//#include "rational.h"
+//#include "intfloat_readwrite.h"
 #include "log.h"
-#include "pixfmt.h"
+//#include "pixfmt.h"
 
 #endif /* AVUTIL_AVUTIL_H */
diff --git a/apps/codecs/libwmapro/libavutil/bswap.h b/apps/codecs/libwmapro/libavutil/bswap.h
index 74c7af3026..5743e126b8 100644
--- a/apps/codecs/libwmapro/libavutil/bswap.h
+++ b/apps/codecs/libwmapro/libavutil/bswap.h
@@ -27,7 +27,7 @@
 #define AVUTIL_BSWAP_H
 
 #include <stdint.h>
-#include "config.h"
+//#include "config.h"
 #include "attributes.h"
 
 #if   ARCH_ARM
diff --git a/apps/codecs/libwmapro/libavutil/common.h b/apps/codecs/libwmapro/libavutil/common.h
index fae0b5b09b..48732a29dd 100644
--- a/apps/codecs/libwmapro/libavutil/common.h
+++ b/apps/codecs/libwmapro/libavutil/common.h
@@ -290,7 +290,8 @@ static inline av_const int av_ceil_log2(int x)
 
 #include "mem.h"
 
-#ifdef HAVE_AV_CONFIG_H
+//#ifdef HAVE_AV_CONFIG_H
+#if 1
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */
 
diff --git a/apps/codecs/libwmapro/libavutil/internal.h b/apps/codecs/libwmapro/libavutil/internal.h
index b47db3d8c6..2b8da1d8c2 100644
--- a/apps/codecs/libwmapro/libavutil/internal.h
+++ b/apps/codecs/libwmapro/libavutil/internal.h
@@ -34,9 +34,9 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <assert.h>
-#include "config.h"
+//#include "config.h"
 #include "attributes.h"
-#include "timer.h"
+//#include "timer.h"
 
 #ifndef attribute_align_arg
 #if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,2)
@@ -191,7 +191,7 @@
     }\
 }
 
-#include "libm.h"
+//#include "libm.h"
 
 /**
  * Returns NULL if CONFIG_SMALL is true, otherwise the argument
diff --git a/apps/codecs/libwmapro/libavutil/intreadwrite.h b/apps/codecs/libwmapro/libavutil/intreadwrite.h
index c8026f0872..87098d707d 100644
--- a/apps/codecs/libwmapro/libavutil/intreadwrite.h
+++ b/apps/codecs/libwmapro/libavutil/intreadwrite.h
@@ -20,7 +20,7 @@
 #define AVUTIL_INTREADWRITE_H
 
 #include <stdint.h>
-#include "config.h"
+//#include "config.h"
 #include "bswap.h"
 #include "common.h"
 
diff --git a/apps/codecs/libwmapro/libavutil/mathematics.c b/apps/codecs/libwmapro/libavutil/mathematics.c
index 81d47c1bf1..04f3e870d1 100644
--- a/apps/codecs/libwmapro/libavutil/mathematics.c
+++ b/apps/codecs/libwmapro/libavutil/mathematics.c
@@ -129,7 +129,7 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding rnd){
 int64_t av_rescale(int64_t a, int64_t b, int64_t c){
     return av_rescale_rnd(a, b, c, AV_ROUND_NEAR_INF);
 }
-
+#if 0
 int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq){
     int64_t b= bq.num * (int64_t)cq.den;
     int64_t c= cq.num * (int64_t)bq.den;
@@ -143,7 +143,7 @@ int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b){
     if (av_rescale_rnd(ts_b, b, a, AV_ROUND_DOWN) < ts_a) return  1;
     return 0;
 }
-
+#endif
 #ifdef TEST
 #include "integer.h"
 #undef printf
diff --git a/apps/codecs/libwmapro/libavutil/mathematics.h b/apps/codecs/libwmapro/libavutil/mathematics.h
index e198aef8cb..a09d3e9ad8 100644
--- a/apps/codecs/libwmapro/libavutil/mathematics.h
+++ b/apps/codecs/libwmapro/libavutil/mathematics.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <math.h>
 #include "attributes.h"
-#include "rational.h"
+//#include "rational.h"
 
 #ifndef M_E
 #define M_E            2.7182818284590452354   /* e */
@@ -84,7 +84,7 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_cons
 /**
  * Rescales a 64-bit integer by 2 rational numbers.
  */
-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
+//int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
 
 /**
  * Compares 2 timestamps each in its own timebases.
@@ -92,7 +92,7 @@ int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
  * is outside the int64_t range when represented in the others timebase.
  * @return -1 if ts_a is before ts_b, 1 if ts_a is after ts_b or 0 if they represent the same position
  */
-int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
+//int av_compare_ts(int64_t ts_a, AVRational tb_a, int64_t ts_b, AVRational tb_b);
 
 
 #endif /* AVUTIL_MATHEMATICS_H */
diff --git a/apps/codecs/libwmapro/libavutil/mem.c b/apps/codecs/libwmapro/libavutil/mem.c
index 4d776d4450..7c37e9be9f 100644
--- a/apps/codecs/libwmapro/libavutil/mem.c
+++ b/apps/codecs/libwmapro/libavutil/mem.c
@@ -24,7 +24,7 @@
  * default memory allocator for libavutil
  */
 
-#include "config.h"
+//#include "config.h"
 
 #include <limits.h>
 #include <stdlib.h>