summaryrefslogtreecommitdiff
path: root/apps/codecs/libwmavoice/libavutil
diff options
context:
space:
mode:
authorMohamed Tarek <mt@rockbox.org>2010-08-07 13:06:05 +0000
committerMohamed Tarek <mt@rockbox.org>2010-08-07 13:06:05 +0000
commitfb26f52697f1bb215375b4acaa626ff36d8d4208 (patch)
tree8007ecfc48b7a70a866c07fcf0918b9c8f0e57f3 /apps/codecs/libwmavoice/libavutil
parente3a6610ae7d2dfa5e7a0393938bccec07baf5b75 (diff)
downloadrockbox-fb26f52697f1bb215375b4acaa626ff36d8d4208.zip
rockbox-fb26f52697f1bb215375b4acaa626ff36d8d4208.tar.gz
rockbox-fb26f52697f1bb215375b4acaa626ff36d8d4208.tar.bz2
rockbox-fb26f52697f1bb215375b4acaa626ff36d8d4208.tar.xz
Add missing files from ffmpeg, write a README.rockbox and a makefile.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27742 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libwmavoice/libavutil')
-rw-r--r--apps/codecs/libwmavoice/libavutil/avutil.h8
-rw-r--r--apps/codecs/libwmavoice/libavutil/mathematics.c2
-rw-r--r--apps/codecs/libwmavoice/libavutil/mathematics.h6
-rw-r--r--apps/codecs/libwmavoice/libavutil/mem.c2
4 files changed, 10 insertions, 8 deletions
diff --git a/apps/codecs/libwmavoice/libavutil/avutil.h b/apps/codecs/libwmavoice/libavutil/avutil.h
index 50b29fc..457829a 100644
--- a/apps/codecs/libwmavoice/libavutil/avutil.h
+++ b/apps/codecs/libwmavoice/libavutil/avutil.h
@@ -79,11 +79,11 @@ enum AVMediaType {
};
#include "common.h"
-#include "error.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/libwmavoice/libavutil/mathematics.c b/apps/codecs/libwmavoice/libavutil/mathematics.c
index c6851cb..c4fbe3b 100644
--- a/apps/codecs/libwmavoice/libavutil/mathematics.c
+++ b/apps/codecs/libwmavoice/libavutil/mathematics.c
@@ -130,6 +130,7 @@ 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,6 +144,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
int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod){
int64_t c= (a-b) & (mod-1);
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.h b/apps/codecs/libwmavoice/libavutil/mathematics.h
index 882a516..e07d4fe 100644
--- a/apps/codecs/libwmavoice/libavutil/mathematics.h
+++ b/apps/codecs/libwmavoice/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 */
@@ -87,7 +87,7 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_cons
/**
* Rescale 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;
/**
* Compare 2 timestamps each in its own timebases.
@@ -95,7 +95,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);
/**
* Compare 2 integers modulo mod.
diff --git a/apps/codecs/libwmavoice/libavutil/mem.c b/apps/codecs/libwmavoice/libavutil/mem.c
index 8cad089..a9a3283 100644
--- a/apps/codecs/libwmavoice/libavutil/mem.c
+++ b/apps/codecs/libwmavoice/libavutil/mem.c
@@ -24,7 +24,7 @@
* default memory allocator for libavutil
*/
-#include "config.h"
+//#include "config.h"
#include <limits.h>
#include <stdlib.h>