Changeset 15240feb in ffmpeg

Timestamp:

Sep 13, 2011, 11:23:16 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

872655fe

Parents:

f27f68eb (diff), 9c29ab58 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)