diff options
author | Reinhard Tartler <siretart@tauware.de> | 2011-02-07 14:37:08 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-16 23:00:30 +0100 |
commit | 7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch) | |
tree | 4510accdfd282fafb4f8caae1055c76ebf45e4c0 /libavutil/Makefile | |
parent | fad8143f5b9689e0e2dafe46500d944cfa58a911 (diff) | |
download | ffmpeg-7ffe76e540297ad4df2896064f83cb1adbd81fd9.tar.gz |
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
Diffstat (limited to 'libavutil/Makefile')
-rw-r--r-- | libavutil/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index fe0302c3b4..300acb1896 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -4,6 +4,7 @@ NAME = avutil HEADERS = adler32.h \ attributes.h \ + audioconvert.h \ avassert.h \ avstring.h \ avutil.h \ @@ -16,6 +17,7 @@ HEADERS = adler32.h \ eval.h \ fifo.h \ file.h \ + imgutils.h \ intfloat_readwrite.h \ intreadwrite.h \ lfg.h \ @@ -25,16 +27,19 @@ HEADERS = adler32.h \ md5.h \ mem.h \ opt.h \ + parseutils.h \ pixdesc.h \ pixfmt.h \ random_seed.h \ rational.h \ + samplefmt.h \ sha1.h \ BUILT_HEADERS = avconfig.h OBJS = adler32.o \ aes.o \ + audioconvert.o \ avstring.o \ base64.o \ cpu.o \ @@ -44,6 +49,7 @@ OBJS = adler32.o \ eval.o \ fifo.o \ file.o \ + imgutils.o \ intfloat_readwrite.o \ inverse.o \ lfg.o \ @@ -54,10 +60,12 @@ OBJS = adler32.o \ md5.o \ mem.o \ opt.o \ + parseutils.o \ pixdesc.o \ random_seed.o \ rational.o \ rc4.o \ + samplefmt.o \ sha.o \ tree.o \ utils.o \ |