diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-07-27 20:56:59 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-08-12 13:27:30 +0200 |
commit | 6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3 (patch) | |
tree | ce39de2c1a0f9a48da739fc10a192cca0345efff /Makefile | |
parent | 791a86c37a03b94207bc2d0ad4cbe7f39d7e495a (diff) | |
download | ffmpeg-streaming-6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3.zip ffmpeg-streaming-6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3.tar.gz |
Make a copy of ffmpeg under a new name -- avconv.
It will be further developed with a few incompatible changes.
ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -53,6 +53,7 @@ COMPILE_S = $(call COMPILE,AS) %.c %.h: TAG = GEN PROGS-$(CONFIG_FFMPEG) += ffmpeg +PROGS-$(CONFIG_AVCONV) += avconv PROGS-$(CONFIG_AVPLAY) += avplay PROGS-$(CONFIG_AVPROBE) += avprobe PROGS-$(CONFIG_AVSERVER) += avserver @@ -64,7 +65,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%) TOOLS = qt-faststart trasher TOOLS-$(CONFIG_ZLIB) += cws2fws -BASENAMES = ffmpeg avplay avprobe avserver +BASENAMES = ffmpeg avconv avplay avprobe avserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) |