diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 20:18:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 20:33:26 +0100 |
| commit | c4e8821732999f720535bb2eb1e8c7f1ea1db18f (patch) | |
| tree | 12b31863b7145b0342207aafd0ffa256da2904b9 /libavutil/Makefile | |
| parent | fee484edaff77fc831d4cbbdd259ea0948103f86 (diff) | |
| parent | 7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e (diff) | |
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
Move AVFrame from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index e7bb7f08fc..87e222bb1c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -23,6 +23,7 @@ HEADERS = adler32.h \ eval.h \ fifo.h \ file.h \ + frame.h \ hmac.h \ imgutils.h \ intfloat.h \ @@ -76,6 +77,7 @@ OBJS = adler32.o \ fifo.o \ file.o \ float_dsp.o \ + frame.o \ hmac.o \ imgutils.o \ intfloat_readwrite.o \ |