doc/avconv: expand documentation for the -s option.

[ffmpeg] / libavutil / Makefile

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 01344df2a3845e512255f9c758f44a53f406ca2d..fb19ebf1e2d9b9e69cd5b316cb5774cfe7634beb 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -3,6 +3,7 @@ NAME = avutil
 HEADERS = adler32.h                                                     \
           aes.h                                                         \
           attributes.h                                                  \
+          audio_fifo.h                                                  \
           audioconvert.h                                                \
           avassert.h                                                    \
           avstring.h                                                    \
@@ -17,6 +18,7 @@ HEADERS = adler32.h                                                     \
           fifo.h                                                        \
           file.h                                                        \
           imgutils.h                                                    \
+          intfloat.h                                                    \
           intfloat_readwrite.h                                          \
           intreadwrite.h                                                \
           lfg.h                                                         \
@@ -35,10 +37,16 @@ HEADERS = adler32.h                                                     \
           samplefmt.h                                                   \
           sha.h                                                         \
 
+ARCH_HEADERS = bswap.h                                                  \
+               intmath.h                                                \
+               intreadwrite.h                                           \
+               timer.h                                                  \
+
 BUILT_HEADERS = avconfig.h
 
 OBJS = adler32.o                                                        \
        aes.o                                                            \
+       audio_fifo.o                                                     \
        audioconvert.o                                                   \
        avstring.o                                                       \
        base64.o                                                         \
@@ -71,17 +79,19 @@ OBJS = adler32.o                                                        \
        tree.o                                                           \
        utils.o                                                          \
 
-OBJS-$(ARCH_ARM) += arm/cpu.o
-OBJS-$(ARCH_PPC) += ppc/cpu.o
-OBJS-$(ARCH_X86) += x86/cpu.o
-
-TESTPROGS = adler32 aes base64 cpu crc des eval lls md5 pca sha tree
-TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
-
-DIRS = arm bfin sh4 x86
-
-ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
-
-include $(SRC_PATH)/subdir.mak
-
-$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
+TESTPROGS = adler32                                                     \
+            aes                                                         \
+            avstring                                                    \
+            base64                                                      \
+            cpu                                                         \
+            crc                                                         \
+            des                                                         \
+            eval                                                        \
+            fifo                                                        \
+            lfg                                                         \
+            lls                                                         \
+            md5                                                         \
+            opt                                                         \
+            parseutils                                                  \
+            sha                                                         \
+            tree                                                        \