Permalink
Browse files

Cumulated changes from previous sync

  • Loading branch information...
Beirdo committed Apr 1, 2012
1 parent 4300f0e commit 52be9885d38cdaa7a70660c66245c20fa8f87008
Showing with 2,598 additions and 146 deletions.
  1. +24 −15 mythtv/external/FFmpeg/Makefile
  2. +0 −3 mythtv/external/FFmpeg/configure
  3. +10 −0 mythtv/external/FFmpeg/libavcodec/Makefile
  4. +434 −0 mythtv/external/FFmpeg/libavcodec/aaclatmdec.c
  5. +3 −0 mythtv/external/FFmpeg/libavcodec/allcodecs.c
  6. +31 −0 mythtv/external/FFmpeg/libavcodec/avcodec.h
  7. +5 −1 mythtv/external/FFmpeg/libavcodec/dvbsub_parser.c
  8. +32 −8 mythtv/external/FFmpeg/libavcodec/dvbsubdec.c
  9. +1 −1 mythtv/external/FFmpeg/libavcodec/dvdsubdec.c
  10. +6 −0 mythtv/external/FFmpeg/libavcodec/h264_refs.c
  11. +186 −0 mythtv/external/FFmpeg/libavcodec/mpeg12.c
  12. +6 −1 mythtv/external/FFmpeg/libavcodec/mpeg4videodec.c
  13. +8 −1 mythtv/external/FFmpeg/libavcodec/mpeg4videoenc.c
  14. +1 −1 mythtv/external/FFmpeg/libavcodec/mpegaudio_parser.c
  15. +4 −0 mythtv/external/FFmpeg/libavcodec/mpegaudiodec.c
  16. +1 −0 mythtv/external/FFmpeg/libavcodec/mpegaudiodecheader.c
  17. +6 −1 mythtv/external/FFmpeg/libavcodec/mpegvideo.c
  18. +7 −0 mythtv/external/FFmpeg/libavcodec/mpegvideo.h
  19. +235 −0 mythtv/external/FFmpeg/libavcodec/myth_utils.c
  20. +7 −0 mythtv/external/FFmpeg/libavcodec/pcm.c
  21. +2 −0 mythtv/external/FFmpeg/libavcodec/x86/Makefile
  22. +8 −5 mythtv/external/FFmpeg/libavcodec/x86/dsputil_mmx.c
  23. +2 −2 mythtv/external/FFmpeg/libavcodec/x86/dsputil_mmx.h
  24. +311 −0 mythtv/external/FFmpeg/libavcodec/x86/mmx.h
  25. +16 −0 mythtv/external/FFmpeg/libavformat/avformat.h
  26. +12 −0 mythtv/external/FFmpeg/libavformat/mpeg.c
  27. +1 −0 mythtv/external/FFmpeg/libavformat/mpeg.h
  28. +929 −93 mythtv/external/FFmpeg/libavformat/mpegts.c
  29. +44 −2 mythtv/external/FFmpeg/libavformat/mpegts.h
  30. +1 −1 mythtv/external/FFmpeg/libavformat/nuv.c
  31. +219 −9 mythtv/external/FFmpeg/libavformat/utils.c
  32. +15 −0 mythtv/external/FFmpeg/libavutil/bswap.h
  33. +1 −0 mythtv/external/FFmpeg/libavutil/internal.h
  34. +9 −1 mythtv/external/FFmpeg/libpostproc/Makefile
  35. +18 −0 mythtv/external/FFmpeg/libpostproc/postprocess.c
  36. +1 −1 mythtv/external/FFmpeg/libswscale/Makefile
  37. +2 −0 mythtv/external/FFmpeg/libswscale/utils.c
@@ -1,14 +1,15 @@
-MAIN_MAKEFILE=1
include config.mak
-vpath %.c $(SRC_PATH)
-vpath %.cpp $(SRC_PATH)
-vpath %.h $(SRC_PATH)
-vpath %.S $(SRC_PATH)
-vpath %.asm $(SRC_PATH)
-vpath %.v $(SRC_PATH)
-vpath %.texi $(SRC_PATH)
-vpath %/fate_config.sh.template $(SRC_PATH)
+SRC_DIR = $(SRC_PATH_BARE)
+
+vpath %.c $(SRC_PATH_BARE)
+vpath %.cpp $(SRC_PATH_BARE)
+vpath %.h $(SRC_PATH_BARE)
+vpath %.S $(SRC_PATH_BARE)
+vpath %.asm $(SRC_PATH_BARE)
+vpath %.v $(SRC_PATH_BARE)
+vpath %.texi $(SRC_PATH_BARE)
+vpath %/fate_config.sh.template $(SRC_PATH_BARE)
PROGS-$(CONFIG_FFMPEG) += ffmpeg
PROGS-$(CONFIG_FFPLAY) += ffplay
@@ -22,6 +23,7 @@ TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64
HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options
TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
+MYTHPROGS = $(addprefix myth, ${PROGS})
BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF))
@@ -42,7 +44,7 @@ DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe
SKIPHEADERS = cmdutils_common_opts.h
-include $(SRC_PATH)/common.mak
+include common.mak
FF_EXTRALIBS := $(FFEXTRALIBS)
FF_DEP_LIBS := $(DEP_LIBS)
@@ -58,6 +60,9 @@ $(TOOLS): %$(EXESUF): %.o
tools/cws2fws$(EXESUF): ELIBS = -lz
+${MYTHPROGS}: myth%: %
+ $(CP) $< $@
+
config.h: .config
.config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c))
@-tput bold 2>/dev/null
@@ -95,8 +100,8 @@ OBJDIRS += tools
-include $(wildcard tools/*.d)
-VERSION_SH = $(SRC_PATH)/version.sh
-GIT_LOG = $(SRC_PATH)/.git/logs/HEAD
+VERSION_SH = $(SRC_PATH_BARE)/external/FFmpeg/version.sh
+GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
.version: M=@
@@ -109,7 +114,7 @@ version.h .version:
-include .version
ifdef PROGS
-install: install-progs install-data
+install: install-mythprogs
endif
install: install-libs install-headers
@@ -123,6 +128,10 @@ install-progs: install-progs-yes $(PROGS)
$(Q)mkdir -p "$(BINDIR)"
$(INSTALL) -c -m 755 $(INSTPROGS) "$(BINDIR)"
+install-mythprogs: install-progs-yes $(MYTHPROGS)
+ $(Q)mkdir -p "$(BINDIR)"
+ $(INSTALL) -c -m 755 $(MYTHPROGS) "$(BINDIR)"
+
install-data: $(DATA_FILES)
$(Q)mkdir -p "$(DATADIR)"
$(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
@@ -159,8 +168,8 @@ coverage-html: coverage.info
$(Q)genhtml -o $@ $<
$(Q)touch $@
-include $(SRC_PATH)/doc/Makefile
-include $(SRC_PATH)/tests/Makefile
+#include $(SRC_PATH)/doc/Makefile
+#include $(SRC_PATH)/tests/Makefile
$(sort $(OBJDIRS)):
$(Q)mkdir -p $@
@@ -1452,8 +1452,6 @@ mp3on4float_decoder_select="mpegaudiodsp"
mpc7_decoder_select="mpegaudiodsp"
mpc8_decoder_select="mpegaudiodsp"
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
-mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
-mpeg_xvmc_decoder_select="mpegvideo_decoder"
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
mpeg1_vdpau_hwaccel_select="vdpau mpeg1video_decoder"
mpeg1video_encoder_select="aandct"
@@ -3090,7 +3088,6 @@ check_header sys/select.h
check_header termios.h
check_header vdpau/vdpau.h
check_header vdpau/vdpau_x11.h
-check_header X11/extensions/XvMClib.h
check_header asm/types.h
disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib
@@ -3,6 +3,14 @@ include $(SUBDIR)../config.mak
NAME = avcodec
FFLIBS = avutil
+# x86_32 needs -O1 -fomit-frame-pointer to compile inline asm
+ifeq ($(ARCH_X86_32), yes)
+ CFLAGS += -fomit-frame-pointer
+ ifneq (, $(findstring debug, $(CCONFIG)))
+ CFLAGS += -O1
+ endif
+endif
+
HEADERS = avcodec.h avfft.h dxva2.h vaapi.h vda.h vdpau.h version.h xvmc.h
OBJS = allcodecs.o \
@@ -15,6 +23,7 @@ OBJS = allcodecs.o \
fmtconvert.o \
imgconvert.o \
jrevdct.o \
+ myth_utils.o \
options.o \
parser.o \
raw.o \
@@ -63,6 +72,7 @@ OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \
psymodel.o iirfilter.o \
mpeg4audio.o kbdwin.o \
audio_frame_queue.o
+OBJS-$(CONFIG_AAC_LATM_DECODER) += aaclatmdec.o
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3dec_data.o ac3.o kbdwin.o
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc_float.o ac3enc.o ac3tab.o \
Oops, something went wrong.

0 comments on commit 52be988

Please sign in to comment.