diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-08-13 15:37:48 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2011-08-13 15:37:48 +0400 |
| commit | b21278547d37abb435030f7ddc36ca3e79c0e466 (patch) | |
| tree | 04474e381fdb2260d2a17ca210ae5263ce79bfdb | |
| parent | 4df45955c8b2152a0c85b8dcfb3bfb487d7ed17e (diff) | |
Update ffmpeg
| -rw-r--r-- | build_ff_win32.sh | 1 | ||||
| -rw-r--r-- | build_ff_x64.sh | 1 | ||||
| m--------- | ffmpeg | 0 |
3 files changed, 2 insertions, 0 deletions
diff --git a/build_ff_win32.sh b/build_ff_win32.sh index ab6de826..fa3f0697 100644 --- a/build_ff_win32.sh +++ b/build_ff_win32.sh @@ -31,6 +31,7 @@ OPTIONS=" --disable-ffplay \ --disable-ffserver \ --disable-ffmpeg \ +--disable-avconv \ --disable-ffprobe \ --disable-devices \ --disable-filters \ diff --git a/build_ff_x64.sh b/build_ff_x64.sh index 9bfafb54..4559b2d0 100644 --- a/build_ff_x64.sh +++ b/build_ff_x64.sh @@ -31,6 +31,7 @@ OPTIONS=" --disable-ffplay \ --disable-ffserver \ --disable-ffmpeg \ +--disable-avconv \ --disable-ffprobe \ --disable-devices \ --disable-filters \ diff --git a/ffmpeg b/ffmpeg -Subproject 456cce028fc55b39ef57ed448de17106e9e85b2 +Subproject 7610be3a29f621bbc9dfff867119396d55950df |