diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 21:36:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 22:40:32 +0200 |
| commit | 3d7218d932923e2b964fef37e8993fd0a6df7c1d (patch) | |
| tree | 8d84104fd947b896e3879276a85c0f98f80fa191 /libswscale/Makefile | |
| parent | d90ba411aba28ebaced788f0810e082d9525bc13 (diff) | |
| parent | 449511740f06a4675b0066730fa45cdb764ffafc (diff) | |
| download | ffmpeg-streaming-3d7218d932923e2b964fef37e8993fd0a6df7c1d.zip ffmpeg-streaming-3d7218d932923e2b964fef37e8993fd0a6df7c1d.tar.gz | |
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
build: handle library dependencies in configure
Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
| -rw-r--r-- | libswscale/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile index ca6e27d..e96837f 100644 --- a/libswscale/Makefile +++ b/libswscale/Makefile @@ -1,7 +1,6 @@ include $(SUBDIR)../config.mak NAME = swscale -FFLIBS = avutil HEADERS = swscale.h \ version.h \ |
