virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'

Browse Source 
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-13 21:36:14 +02:00
parent d90ba411ab 449511740f
commit 3d7218d932
8 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/Makefile
View File

@@ -1,7 +1,6 @@
include $(SUBDIR)../config.mak
NAME = avformat
FFLIBS = avcodec avutil
HEADERS = avformat.h \
avio.h \