1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

11 Commits

Author SHA1 Message Date
Michael Niedermayer
98eb99d20b tools/build_libstagefright: switch git urls to https
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12 23:07:00 +01:00
Michael Niedermayer
74e4bb6912 Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
  libstagefright: avoid memory leak
  libstagefright: support more output pixel formats
  libstagefright: avoid potential deadlock on output MediaBuffer
  libstagefright: explicitly set positive timestamps as stagefright expects them so
  Merge branches 'stagefright' and 'stagefright-test' into stagefright-test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-19 01:58:30 +02:00
Mohamed Naufal
7b915a4045 libstagefright: explicitly set positive timestamps as stagefright expects them so 2012-04-19 00:02:53 +05:30
Michael Niedermayer
31801ded9a Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
  libstagefright: fix build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-10 20:59:44 +01:00
Dmitry Monakhov
d7b786e9a1 libstagefright: fix build
- Use headers from gingerbread-release branch instead of the current default ice cream sandwich
- Fix path mistype
2012-01-10 22:45:53 +05:30
Michael Niedermayer
072a62b50a Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
  tools/build_libstagefright: fetch android system headers and libraries
  libstagefright: reindent after previous commit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-13 18:04:02 +02:00
Mohamed Naufal
e82cbb69a7 tools/build_libstagefright: fetch android system headers and libraries
Credit to Martin.
2011-10-09 14:36:12 +05:30
Michael Niedermayer
d2a847c203 Merge remote-tracking branch 'hexene/scratchpad'
* hexene/scratchpad:
  libstagefright: Explicitly free smart pointer objects
  Changelog: Explain why C++ support is added, and that its optional
  tools/build_libstagefright: rename build/libav to something neutral

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14 17:46:49 +02:00
Michael Niedermayer
b5824233fb tools/build_libstagefright: rename build/libav to something neutral
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-14 19:51:18 +05:30
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
Mohamed Naufal
9c29ab5851 Move & Rename buildscript, remove tabs 2011-09-09 23:14:36 +05:30