1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 15240feb99 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>
2011-09-14 01:23:16 +02:00
..
2011-08-15 00:39:55 +02:00
2011-06-02 20:06:00 +01:00
2011-08-12 17:20:57 +02:00
2011-09-10 00:26:48 +02:00
2011-06-02 20:06:00 +01:00
2011-08-15 00:39:55 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-08-30 05:41:44 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-09-10 00:26:48 +02:00
2011-09-11 04:07:08 +02:00
2011-09-06 18:20:34 +02:00
2011-09-07 01:10:14 +02:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-09-13 01:27:35 +02:00
2011-09-07 01:10:14 +02:00
2011-09-10 00:26:48 +02:00
2011-09-07 12:16:15 +02:00
2011-09-11 12:54:47 +02:00
2011-09-01 02:38:56 +02:00
2011-09-10 22:10:00 +02:00
2011-08-15 00:39:55 +02:00
2011-06-21 13:17:10 +02:00