Permalink
Browse files

Build ffmpeg as mythffmpeg and install

This will allow nuvexport to standardize on using the snapshotted ffmpeg which
is built against the libmythav* libraries, as is mythtv itself.  This will
get rid of the constant changes in ffmpeg command-line arguments once and for
all.  At every ffmpeg resync, we will need to be sure that this is recreated,
and then that nuvexport uses whatever changed command-line arguments that the
new sync uses.
  • Loading branch information...
Beirdo committed Dec 11, 2010
1 parent fdd6b2f commit 8c6de4675d6d3ba234999611d35901953074b1d2
Showing with 14 additions and 1 deletion.
  1. +1 −0 mythtv/configure
  2. +3 −0 mythtv/external/.gitignore
  3. +10 −1 mythtv/external/FFmpeg/Makefile
View
@@ -1955,6 +1955,7 @@ enable avutil
enable asm
enable debug
#enable doc
+enable ffmpeg
enable fastdiv
enable gpl
enable mpegaudio_hp
@@ -8,3 +8,6 @@ version.h
config.mak
config.h
avconfig.h
+ffmpeg
+ffmpeg_g
+mythffmpeg
@@ -16,6 +16,7 @@ MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
HTMLPAGES = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes)))
TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64)
+MYTHPROGS = $(addprefix myth, ${PROGS})
BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES))
@@ -46,7 +47,8 @@ FF_DEP_LIBS := $(DEP_LIBS)
ALL_TARGETS-$(CONFIG_DOC) += documentation
ifdef PROGS
-INSTALL_TARGETS-yes += install-progs install-data
+INSTALL_TARGETS-yes += install-mythprogs
+#INSTALL_TARGETS-yes += install-progs install-data
INSTALL_TARGETS-$(CONFIG_DOC) += install-man
endif
INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
@@ -57,6 +59,9 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
$(CP) $< $@
$(STRIP) $@
+${MYTHPROGS}: myth%: %
+ $(CP) $< $@
+
config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
@-tput bold 2>/dev/null
@@ -137,6 +142,10 @@ install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
$(Q)mkdir -p "$(BINDIR)"
$(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
+install-mythprogs: $(MYTHPROGS) $(INSTALL_PROGS_TARGETS-yes)
+ $(Q)mkdir -p "$(BINDIR)"
+ $(INSTALL) -c -m 755 $(MYTHPROGS) "$(BINDIR)"
+
install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)"
$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"

0 comments on commit 8c6de46

Please sign in to comment.