@@ -6,7 +6,7 @@ include config.mak

 VPATH=$(SRC_PATH)

-CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE

+CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE

 LDFLAGS+= -g 

 ifeq ($(TARGET_GPROF),yes)

@@ -91,11 +91,12 @@ endif

 OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)

 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)

-FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF)

+FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF) -L./libavutil -lavutil$(BUILDSUF)

 all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)

 lib:

+	$(MAKE) -C libavutil all

 	$(MAKE) -C libavcodec all

 	$(MAKE) -C libavformat all

@@ -140,6 +141,7 @@ documentation:

 .PHONY: install

 install: all install-man $(INSTALLVHOOK)

+	$(MAKE) -C libavutil install

 	$(MAKE) -C libavcodec install

 	$(MAKE) -C libavformat install

 	install -d "$(bindir)"

@@ -162,6 +164,7 @@ install-vhook:

 	$(MAKE) -C vhook install

 installlib:

+	$(MAKE) -C libavutil installlib

 	$(MAKE) -C libavcodec installlib

 	$(MAKE) -C libavformat installlib

@@ -182,6 +185,7 @@ endif

 	@for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done

 clean: $(CLEANVHOOK)

+	$(MAKE) -C libavutil clean

 	$(MAKE) -C libavcodec clean

 	$(MAKE) -C libavformat clean

 	$(MAKE) -C tests clean

@@ -7,7 +7,7 @@ include ../config.mak

 VPATH=$(SRC_PATH)/libavcodec

 # NOTE: -I.. is needed to include config.h

-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)

+CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE $(AMR_CFLAGS)

 OBJS= bitstream.o utils.o mem.o allcodecs.o \

       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\

@@ -16,8 +16,8 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \

       mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \

       ratecontrol.o adpcm.o eval.o error_resilience.o \

       fft.o mdct.o raw.o golomb.o cabac.o\

-      dpcm.o adx.o rational.o faandct.o parser.o g726.o \

-      vp3dsp.o integer.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o

+      dpcm.o adx.o faandct.o parser.o g726.o \

+      vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o

 ifeq ($(CONFIG_AASC_DECODER),yes)

     OBJS+= aasc.o

@@ -234,6 +234,8 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \

 endif

 endif

+EXTRALIBS += -L$(SRC_PATH)/libavutil -lavutil$(BUILDSUF)

+

 # currently using libdts for dts decoding

 ifeq ($(CONFIG_DTS),yes)

 OBJS+= dtsdec.o

@@ -375,6 +377,7 @@ SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)

 OBJS := $(OBJS) $(ASM_OBJS)

 LIB= $(LIBPREF)avcodec$(LIBSUF)

+LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)

 ifeq ($(BUILD_SHARED),yes)

 SLIB= $(SLIBPREF)avcodec$(SLIBSUF)

 endif

@@ -446,7 +449,7 @@ cleanamrwbfloat:

 # api example program

 apiexample: apiexample.c $(LIB)

-	$(CC) $(CFLAGS) -o $@ $< $(LIB) $(EXTRALIBS) -lm

+	$(CC) $(CFLAGS) -o $@ $< $(LIB) $(LIBAVUTIL) $(EXTRALIBS) -lm

 # cpuid test

 cpuid_test: i386/cputest.c

@@ -464,7 +467,7 @@ motion-test: motion_test.o $(LIB)

 	$(CC) -o $@ $^ -lm

 fft-test: fft-test.o $(LIB)

-	$(CC) -o $@ $^ -lm

+	$(CC) -o $@ $^ $(LIBAVUTIL) -lm

 ifeq ($(BUILD_SHARED),yes)

 install: all install-headers

@@ -489,8 +492,6 @@ installlib: all install-headers

 install-headers:

 	mkdir -p "$(prefix)/include/ffmpeg"

 	install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \

-	               $(SRC_PATH)/libavcodec/common.h \

-	               $(SRC_PATH)/libavcodec/rational.h \

                 "$(prefix)/include/ffmpeg"

 	install -d $(libdir)/pkgconfig

 	install -m 644 ../libavcodec.pc $(libdir)/pkgconfig

@@ -11,8 +11,7 @@

 extern "C" {

 #endif

-#include "common.h"

-#include "rational.h"

+#include "avutil.h"

 #include <sys/types.h> /* size_t */

 //FIXME the following 2 really dont belong in here

@@ -22,8 +21,8 @@ extern "C" {

 #define AV_STRINGIFY(s)	AV_TOSTRING(s)

 #define AV_TOSTRING(s) #s

-#define LIBAVCODEC_VERSION_INT ((49<<16)+(0<<8)+0)

-#define LIBAVCODEC_VERSION     49.0.0

+#define LIBAVCODEC_VERSION_INT ((49<<16)+(0<<8)+1)

+#define LIBAVCODEC_VERSION     49.0.1

 #define LIBAVCODEC_BUILD       LIBAVCODEC_VERSION_INT

 #define LIBAVCODEC_IDENT       "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)

@@ -279,14 +278,6 @@ enum Motion_Est_ID {

     ME_X1

 };

-enum AVRounding {

-    AV_ROUND_ZERO     = 0, ///< round toward zero

-    AV_ROUND_INF      = 1, ///< round away from zero

-    AV_ROUND_DOWN     = 2, ///< round toward -infinity

-    AV_ROUND_UP       = 3, ///< round toward +infinity

-    AV_ROUND_NEAR_INF = 5, ///< round to nearest and halfway cases away from zero

-};

-

 enum AVDiscard{

 //we leave some space between them for extensions (drop some keyframes for intra only or drop just some bidir frames)

     AVDISCARD_NONE   =-16, ///< discard nothing

@@ -2308,36 +2299,6 @@ void avcodec_default_free_buffers(AVCodecContext *s);

  */

 char av_get_pict_type_char(int pict_type);

-/**

- * reduce a fraction.

- * this is usefull for framerate calculations

- * @param max the maximum allowed for dst_nom & dst_den

- * @return 1 if exact, 0 otherwise

- */

-int av_reduce(int *dst_nom, int *dst_den, int64_t nom, int64_t den, int64_t max);

-

-/**

- * rescale a 64bit integer with rounding to nearest.

- * a simple a*b/c isn't possible as it can overflow

- */

-int64_t av_rescale(int64_t a, int64_t b, int64_t c);

-

-/**

- * rescale a 64bit integer with specified rounding.

- * a simple a*b/c isn't possible as it can overflow

- */

-int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding);

-

-/**

- * rescale a 64bit integer by 2 rational numbers.

- */

-int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq);

-

-double av_int2dbl(int64_t v);

-float av_int2flt(int32_t v);

-int64_t av_dbl2int(double d);

-int32_t av_flt2int(float d);

-

 /* frame parsing */

 typedef struct AVCodecParserContext {

deleted file mode 100644

@@ -1,155 +0,0 @@

-/**

- * @file bswap.h

- * byte swap.

- */

-

-#ifndef __BSWAP_H__

-#define __BSWAP_H__

-

-#ifdef HAVE_BYTESWAP_H

-#include <byteswap.h>

-#else

-

-#ifdef ARCH_X86_64

-#  define LEGACY_REGS "=Q"

-#else

-#  define LEGACY_REGS "=q"

-#endif

-

-#if defined(ARCH_X86) || defined(ARCH_X86_64)

-static always_inline uint16_t bswap_16(uint16_t x)

-{

-  __asm("rorw $8, %0"	:

-        LEGACY_REGS (x)	:

-        "0" (x));

-    return x;

-}

-

-static always_inline uint32_t bswap_32(uint32_t x)

-{

-#if __CPU__ > 386

- __asm("bswap	%0":

-      "=r" (x)     :

-#else

- __asm("xchgb	%b0,%h0\n"

-      "	rorl	$16,%0\n"

-      "	xchgb	%b0,%h0":

-      LEGACY_REGS (x)		:

-#endif

-      "0" (x));

-  return x;

-}

-

-static inline uint64_t bswap_64(uint64_t x)

-{

-#ifdef ARCH_X86_64

-  __asm("bswap	%0":

-        "=r" (x)     :

-        "0" (x));

-  return x;

-#else

-    union { 

-        uint64_t ll;

-        struct {

-           uint32_t l,h;

-        } l;

-    } r;

-    r.l.l = bswap_32 (x);

-    r.l.h = bswap_32 (x>>32);

-    return r.ll;

-#endif

-}

-

-#elif defined(ARCH_SH4)

-

-static always_inline uint16_t bswap_16(uint16_t x) {

-	__asm__("swap.b %0,%0":"=r"(x):"0"(x));

-	return x;

-}

-

-static always_inline uint32_t bswap_32(uint32_t x) {

-	__asm__(

-	"swap.b %0,%0\n"

-	"swap.w %0,%0\n"

-	"swap.b %0,%0\n"

-	:"=r"(x):"0"(x));

-	return x;

-}

-

-static inline uint64_t bswap_64(uint64_t x)

-{

-    union { 

-        uint64_t ll;

-        struct {

-           uint32_t l,h;

-        } l;

-    } r;

-    r.l.l = bswap_32 (x);

-    r.l.h = bswap_32 (x>>32);

-    return r.ll;

-}

-#else

-

-static always_inline uint16_t bswap_16(uint16_t x){

-    return (x>>8) | (x<<8);

-}

-

-#ifdef ARCH_ARM

-static always_inline uint32_t bswap_32(uint32_t x){

-    uint32_t t;

-    __asm__ (

-      "eor %1, %0, %0, ror #16 \n\t"

-      "bic %1, %1, #0xFF0000   \n\t"

-      "mov %0, %0, ror #8      \n\t"

-      "eor %0, %0, %1, lsr #8  \n\t"

-      : "+r"(x), "+r"(t));

-    return x;

-}

-#else

-static always_inline uint32_t bswap_32(uint32_t x){

-    x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);

-    return (x>>16) | (x<<16);

-}

-#endif

-

-static inline uint64_t bswap_64(uint64_t x)

-{

-#if 0

-    x= ((x<< 8)&0xFF00FF00FF00FF00ULL) | ((x>> 8)&0x00FF00FF00FF00FFULL);

-    x= ((x<<16)&0xFFFF0000FFFF0000ULL) | ((x>>16)&0x0000FFFF0000FFFFULL);

-    return (x>>32) | (x<<32);

-#else

-    union { 

-        uint64_t ll;

-        uint32_t l[2]; 

-    } w, r;

-    w.ll = x;

-    r.l[0] = bswap_32 (w.l[1]);

-    r.l[1] = bswap_32 (w.l[0]);

-    return r.ll;

-#endif

-}

-#endif	/* !ARCH_X86 */

-

-#endif	/* !HAVE_BYTESWAP_H */

-

-// be2me ... BigEndian to MachineEndian

-// le2me ... LittleEndian to MachineEndian

-

-#ifdef WORDS_BIGENDIAN

-#define be2me_16(x) (x)

-#define be2me_32(x) (x)

-#define be2me_64(x) (x)

-#define le2me_16(x) bswap_16(x)

-#define le2me_32(x) bswap_32(x)

-#define le2me_64(x) bswap_64(x)

-#else

-#define be2me_16(x) bswap_16(x)

-#define be2me_32(x) bswap_32(x)

-#define be2me_64(x) bswap_64(x)

-#define le2me_16(x) (x)

-#define le2me_32(x) (x)

-#define le2me_64(x) (x)

-#endif

-

-#endif /* __BSWAP_H__ */

deleted file mode 100644

@@ -1,548 +0,0 @@

-/**

- * @file common.h

- * common internal api header.

- */

-

-#ifndef COMMON_H

-#define COMMON_H

-

-#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)

-#    define CONFIG_WIN32

-#endif

-

-#ifndef M_PI

-#define M_PI    3.14159265358979323846

-#endif

-

-#ifdef HAVE_AV_CONFIG_H

-/* only include the following when compiling package */

-#    include "config.h"

-

-#    include <stdlib.h>

-#    include <stdio.h>

-#    include <string.h>

-#    include <ctype.h>

-#    include <limits.h>

-#    ifndef __BEOS__

-#        include <errno.h>

-#    else

-#        include "berrno.h"

-#    endif

-#    include <math.h>

-

-#    ifndef ENODATA

-#        define ENODATA  61

-#    endif

-

-#include <stddef.h>

-#ifndef offsetof

-# define offsetof(T,F) ((unsigned int)((char *)&((T *)0)->F))

-#endif

-

-#define AVOPTION_CODEC_BOOL(name, help, field) \

-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_BOOL }

-#define AVOPTION_CODEC_DOUBLE(name, help, field, minv, maxv, defval) \

-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_DOUBLE, minv, maxv, defval }

-#define AVOPTION_CODEC_FLAG(name, help, field, flag, defval) \

-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_FLAG, flag, 0, defval }

-#define AVOPTION_CODEC_INT(name, help, field, minv, maxv, defval) \

-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_INT, minv, maxv, defval }

-#define AVOPTION_CODEC_STRING(name, help, field, str, val) \

-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_STRING, .defval = val, .defstr = str }

-#define AVOPTION_CODEC_RCOVERRIDE(name, help, field) \

-    { name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE, .defval = 0, .defstr = NULL }

-#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }

-#define AVOPTION_END() AVOPTION_SUB(NULL)

-

-#endif /* HAVE_AV_CONFIG_H */

-

-/* Suppress restrict if it was not defined in config.h.  */

-#ifndef restrict

-#    define restrict

-#endif

-

-#ifndef always_inline

-#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)

-#    define always_inline __attribute__((always_inline)) inline

-#else

-#    define always_inline inline

-#endif

-#endif

-

-#ifndef attribute_used

-#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)

-#    define attribute_used __attribute__((used))

-#else

-#    define attribute_used

-#endif

-#endif

-

-#ifndef attribute_unused

-#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)

-#    define attribute_unused __attribute__((unused))

-#else

-#    define attribute_unused

-#endif

-#endif

-

-#ifndef EMULATE_INTTYPES

-#   include <inttypes.h>

-#else

-    typedef signed char  int8_t;

-    typedef signed short int16_t;

-    typedef signed int   int32_t;

-    typedef unsigned char  uint8_t;

-    typedef unsigned short uint16_t;

-    typedef unsigned int   uint32_t;

-

-#   ifdef CONFIG_WIN32

-        typedef signed __int64   int64_t;

-        typedef unsigned __int64 uint64_t;

-#   else /* other OS */

-        typedef signed long long   int64_t;

-        typedef unsigned long long uint64_t;

-#   endif /* other OS */

-#endif /* HAVE_INTTYPES_H */

-

-#ifndef INT16_MIN

-#define INT16_MIN       (-0x7fff-1)

-#endif

-

-#ifndef INT16_MAX

-#define INT16_MAX       0x7fff

-#endif

-

-#ifndef INT64_MIN

-#define INT64_MIN       (-0x7fffffffffffffffLL-1)

-#endif

-

-#ifndef INT64_MAX

-#define INT64_MAX int64_t_C(9223372036854775807)

-#endif

-

-#ifndef UINT64_MAX

-#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF)

-#endif

-

-#ifdef EMULATE_FAST_INT

-typedef signed char int_fast8_t;

-typedef signed int  int_fast16_t;

-typedef signed int  int_fast32_t;

-typedef unsigned char uint_fast8_t;

-typedef unsigned int  uint_fast16_t;

-typedef unsigned int  uint_fast32_t;

-typedef uint64_t      uint_fast64_t;

-#endif

-

-#ifndef INT_BIT

-#    if INT_MAX != 2147483647

-#        define INT_BIT 64

-#    else

-#        define INT_BIT 32

-#    endif

-#endif

-

-#if defined(CONFIG_OS2) || defined(CONFIG_SUNOS)

-static inline float floorf(float f) { 

-    return floor(f); 

-}

-#endif

-

-#ifdef CONFIG_WIN32

-

-/* windows */

-

-#    if !defined(__MINGW32__) && !defined(__CYGWIN__)

-#        define int64_t_C(c)     (c ## i64)

-#        define uint64_t_C(c)    (c ## i64)

-

-#    ifdef HAVE_AV_CONFIG_H

-#            define inline __inline

-#    endif

-

-#    else

-#        define int64_t_C(c)     (c ## LL)

-#        define uint64_t_C(c)    (c ## ULL)

-#    endif /* __MINGW32__ */

-

-#    ifdef HAVE_AV_CONFIG_H

-#        ifdef _DEBUG

-#            define DEBUG

-#        endif

-

-#        define snprintf _snprintf

-#        define vsnprintf _vsnprintf

-#    endif

-

-/* CONFIG_WIN32 end */

-#elif defined (CONFIG_OS2)

-/* OS/2 EMX */

-

-#ifndef int64_t_C

-#define int64_t_C(c)     (c ## LL)

-#define uint64_t_C(c)    (c ## ULL)

-#endif

-

-#ifdef HAVE_AV_CONFIG_H

-

-#ifdef USE_FASTMEMCPY

-#include "fastmemcpy.h"

-#endif

-

-#include <float.h>

-

-#endif /* HAVE_AV_CONFIG_H */

-

-/* CONFIG_OS2 end */

-#else

-

-/* unix */

-

-#ifndef int64_t_C

-#define int64_t_C(c)     (c ## LL)

-#define uint64_t_C(c)    (c ## ULL)

-#endif

-

-#ifdef HAVE_AV_CONFIG_H

-

-#        ifdef USE_FASTMEMCPY

-#            include "fastmemcpy.h"

-#        endif

-#    endif /* HAVE_AV_CONFIG_H */

-

-#endif /* !CONFIG_WIN32 && !CONFIG_OS2 */

-

-#ifdef HAVE_AV_CONFIG_H

-

-#    include "bswap.h"

-

-// Use rip-relative addressing if compiling PIC code on x86-64.

-#    if defined(__MINGW32__) || defined(__CYGWIN__) || \

-        defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))

-#        if defined(ARCH_X86_64) && defined(PIC)

-#            define MANGLE(a) "_" #a"(%%rip)"

-#        else

-#            define MANGLE(a) "_" #a

-#        endif

-#    else

-#        if defined(ARCH_X86_64) && defined(PIC)

-#            define MANGLE(a) #a"(%%rip)"

-#        else

-#            define MANGLE(a) #a

-#        endif

-#    endif

-

-/* debug stuff */

-

-#    ifndef DEBUG

-#        define NDEBUG

-#    endif

-#    include <assert.h>

-

-/* dprintf macros */

-#    if defined(CONFIG_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)

-

-inline void dprintf(const char* fmt,...) {}

-

-#    else

-

-#        ifdef DEBUG

-#            define dprintf(fmt,...) av_log(NULL, AV_LOG_DEBUG, fmt, __VA_ARGS__)

-#        else

-#            define dprintf(fmt,...)

-#        endif

-

-#    endif /* !CONFIG_WIN32 */

-

-#    define av_abort()      do { av_log(NULL, AV_LOG_ERROR, "Abort at %s:%d\n", __FILE__, __LINE__); abort(); } while (0)

-

-//rounded divison & shift

-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))

-/* assume b>0 */

-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))

-#define ABS(a) ((a) >= 0 ? (a) : (-(a)))

-

-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))

-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))

-

-extern const uint32_t inverse[256];

-

-#if defined(ARCH_X86) || defined(ARCH_X86_64)

-#    define FASTDIV(a,b) \

-    ({\

-        int ret,dmy;\

-        asm volatile(\

-            "mull %3"\

-            :"=d"(ret),"=a"(dmy)\

-            :"1"(a),"g"(inverse[b])\

-            );\

-        ret;\

-    })

-#elif defined(CONFIG_FASTDIV)

-#    define FASTDIV(a,b)   ((uint32_t)((((uint64_t)a)*inverse[b])>>32))

-#else

-#    define FASTDIV(a,b)   ((a)/(b))

-#endif

- 

-/* define it to include statistics code (useful only for optimizing

-   codec efficiency */

-//#define STATS

-

-#ifdef STATS

-

-enum {

-    ST_UNKNOWN,

-    ST_DC,

-    ST_INTRA_AC,

-    ST_INTER_AC,

-    ST_INTRA_MB,

-    ST_INTER_MB,

-    ST_MV,

-    ST_NB,

-};

-

-extern int st_current_index;

-extern unsigned int st_bit_counts[ST_NB];

-extern unsigned int st_out_bit_counts[ST_NB];

-

-void print_stats(void);

-#endif

-

-/* misc math functions */

-extern const uint8_t ff_log2_tab[256];

-

-static inline int av_log2(unsigned int v)

-{

-    int n;

-

-    n = 0;

-    if (v & 0xffff0000) {

-        v >>= 16;

-        n += 16;

-    }

-    if (v & 0xff00) {

-        v >>= 8;

-        n += 8;

-    }

-    n += ff_log2_tab[v];

-

-    return n;

-}

-

-static inline int av_log2_16bit(unsigned int v)

-{

-    int n;

-

-    n = 0;

-    if (v & 0xff00) {

-        v >>= 8;

-        n += 8;

-    }

-    n += ff_log2_tab[v];

-

-    return n;

-}

-

-/* median of 3 */

-static inline int mid_pred(int a, int b, int c)

-{

-#if 0

-    int t= (a-b)&((a-b)>>31);

-    a-=t;

-    b+=t;

-    b-= (b-c)&((b-c)>>31);

-    b+= (a-b)&((a-b)>>31);

-

-    return b;

-#else

-    if(a>b){

-        if(c>b){

-            if(c>a) b=a;

-            else    b=c;

-        }

-    }else{

-        if(b>c){

-            if(c>a) b=c;

-            else    b=a;

-        }

-    }

-    return b;

-#endif

-}

-

-static inline int clip(int a, int amin, int amax)

-{

-    if (a < amin)

-        return amin;

-    else if (a > amax)

-        return amax;

-    else

-        return a;

-}

-

-static inline int clip_uint8(int a)

-{

-    if (a&(~255)) return (-a)>>31;

-    else          return a;

-}

-

-/* math */

-extern const uint8_t ff_sqrt_tab[128];

-

-int64_t ff_gcd(int64_t a, int64_t b);

-

-static inline int ff_sqrt(int a)

-{

-    int ret=0;

-    int s;

-    int ret_sq=0;

-    

-    if(a<128) return ff_sqrt_tab[a];

-    

-    for(s=15; s>=0; s--){

-        int b= ret_sq + (1<<(s*2)) + (ret<<s)*2;

-        if(b<=a){

-            ret_sq=b;

-            ret+= 1<<s;

-        }

-    }

-    return ret;

-}

-

-/**

- * converts fourcc string to int

- */

-static inline int ff_get_fourcc(const char *s){

-    assert( strlen(s)==4 );

-

-    return (s[0]) + (s[1]<<8) + (s[2]<<16) + (s[3]<<24);

-}

-

-#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))

-#define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24))

-

-

-#if defined(ARCH_X86) || defined(ARCH_X86_64)

-#define MASK_ABS(mask, level)\

-            asm volatile(\

-		"cdq			\n\t"\

-		"xorl %1, %0		\n\t"\

-		"subl %1, %0		\n\t"\

-		: "+a" (level), "=&d" (mask)\

-	    );

-#else

-#define MASK_ABS(mask, level)\

-            mask= level>>31;\

-            level= (level^mask)-mask;

-#endif

-

-

-#if __CPU__ >= 686 && !defined(RUNTIME_CPUDETECT)

-#define COPY3_IF_LT(x,y,a,b,c,d)\

-asm volatile (\

-    "cmpl %0, %3	\n\t"\

-    "cmovl %3, %0	\n\t"\

-    "cmovl %4, %1	\n\t"\

-    "cmovl %5, %2	\n\t"\

-    : "+r" (x), "+r" (a), "+r" (c)\

-    : "r" (y), "r" (b), "r" (d)\

-);

-#else

-#define COPY3_IF_LT(x,y,a,b,c,d)\

-if((y)<(x)){\

-     (x)=(y);\

-     (a)=(b);\

-     (c)=(d);\

-}

-#endif

-

-#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_POWERPC)

-#if defined(ARCH_X86_64)

-static inline uint64_t read_time(void)

-{

-	uint64_t a, d;

-	asm volatile(	"rdtsc\n\t"

-		: "=a" (a), "=d" (d)

-	);

-	return (d << 32) | (a & 0xffffffff);

-}

-#elif defined(ARCH_X86)

-static inline long long read_time(void)

-{

-	long long l;

-	asm volatile(	"rdtsc\n\t"

-		: "=A" (l)

-	);

-	return l;

-}

-#else //FIXME check ppc64

-static inline uint64_t read_time(void)

-{

-    uint32_t tbu, tbl, temp;

-

-     /* from section 2.2.1 of the 32-bit PowerPC PEM */

-     __asm__ __volatile__(

-         "1:\n"

-         "mftbu  %2\n"

-         "mftb   %0\n"

-         "mftbu  %1\n"

-         "cmpw   %2,%1\n"

-         "bne    1b\n"

-     : "=r"(tbl), "=r"(tbu), "=r"(temp)

-     :

-     : "cc");

-

-     return (((uint64_t)tbu)<<32) | (uint64_t)tbl;

-}

-#endif

-

-#define START_TIMER \

-uint64_t tend;\

-uint64_t tstart= read_time();\

-

-#define STOP_TIMER(id) \

-tend= read_time();\

-{\

-  static uint64_t tsum=0;\

-  static int tcount=0;\

-  static int tskip_count=0;\

-  if(tcount<2 || tend - tstart < 8*tsum/tcount){\

-      tsum+= tend - tstart;\

-      tcount++;\

-  }else\

-      tskip_count++;\

-  if(256*256*256*64%(tcount+tskip_count)==0){\

-      av_log(NULL, AV_LOG_DEBUG, "%Ld dezicycles in %s, %d runs, %d skips\n", tsum*10/tcount, id, tcount, tskip_count);\

-  }\

-}

-#else

-#define START_TIMER 

-#define STOP_TIMER(id) {}

-#endif

-

-/* avoid usage of various functions */

-#define malloc please_use_av_malloc

-#define free please_use_av_free

-#define realloc please_use_av_realloc

-#define time time_is_forbidden_due_to_security_issues

-#define rand rand_is_forbidden_due_to_state_trashing

-#define srand srand_is_forbidden_due_to_state_trashing

-#define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf

-#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat