diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | build_ff_win32.sh | 5 | ||||
| -rw-r--r-- | build_ff_x64.sh | 5 | ||||
| m--------- | ffmpeg | 0 |
5 files changed, 7 insertions, 7 deletions
@@ -8,4 +8,3 @@ /ipch /bin_Win32 /bin_x64 -/ffmpeg diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..7a4bbe65 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "ffmpeg"] + path = ffmpeg + url = git://git.1f0.de/ffmpeg.git diff --git a/build_ff_win32.sh b/build_ff_win32.sh index d4e1280c..f367ab59 100644 --- a/build_ff_win32.sh +++ b/build_ff_win32.sh @@ -23,10 +23,10 @@ OPTIONS=" --disable-muxers \ --disable-encoders \ --disable-debug \ ---enable-ffplay \ +--disable-ffplay \ --disable-ffserver \ --disable-ffmpeg \ ---enable-ffprobe \ +--disable-ffprobe \ --disable-devices \ --disable-filters \ --disable-avfilter \ @@ -41,6 +41,5 @@ OPTIONS=" make -j4 && cp lib*/*-*.dll ../bin_Win32 && cp lib*/*.lib ../bin_Win32/lib && -cp ffprobe.exe ../bin_Win32 cd .. diff --git a/build_ff_x64.sh b/build_ff_x64.sh index 284e6edc..f0578913 100644 --- a/build_ff_x64.sh +++ b/build_ff_x64.sh @@ -23,10 +23,10 @@ OPTIONS=" --disable-muxers \ --disable-encoders \ --disable-debug \ ---enable-ffplay \ +--disable-ffplay \ --disable-ffserver \ --disable-ffmpeg \ ---enable-ffprobe \ +--disable-ffprobe \ --disable-devices \ --disable-filters \ --disable-avfilter \ @@ -42,6 +42,5 @@ OPTIONS=" make -j4 && cp lib*/*-*.dll ../bin_x64 && cp lib*/*.lib ../bin_x64/lib && -cp ffprobe.exe ../bin_x64 cd .. diff --git a/ffmpeg b/ffmpeg new file mode 160000 +Subproject d16116df35df66b0b123f41f5c0051c61728a4e |