diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 01:23:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 01:23:16 +0200 |
| commit | 15240feb992b6b41ca4afba928b9cb6edb0dc9fb (patch) | |
| tree | 32426c5114bb571a7dba06412ac737a66c1bdd0a /LICENSE | |
| parent | f27f68eb4f7cb43a4d023ce5d1ebd2292313bd9f (diff) | |
| parent | 9c29ab58517cae8d56c7ed7fd5070d8f8c8d429e (diff) | |
| download | ffmpeg-15240feb992b6b41ca4afba928b9cb6edb0dc9fb.tar.gz | |
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 'LICENSE')
0 files changed, 0 insertions, 0 deletions