diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 03:23:16 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 03:23:16 +0400 |
commit | 15240feb992b6b41ca4afba928b9cb6edb0dc9fb (patch) | |
tree | 32426c5114bb571a7dba06412ac737a66c1bdd0a /Makefile | |
parent | f27f68eb4f7cb43a4d023ce5d1ebd2292313bd9f (diff) | |
parent | 9c29ab58517cae8d56c7ed7fd5070d8f8c8d429e (diff) |
Merge remote-tracking branch 'hexene/scratchpad'
* hexene/scratchpad:
Move & Rename buildscript, remove tabs
Fix regular build
Support (H/W accelerated) H.264 decoding on Android via Stagefright
Add build-script for Android
C++ Support ;)
Conflicts:
Changelog
Makefile
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,13 +2,13 @@ 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) - PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_AVCONV) += avconv PROGS-$(CONFIG_FFPLAY) += ffplay |