diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-13 17:54:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-13 18:04:02 +0200 |
| commit | 072a62b50ab4e54ee55585dc06a8e313d713b39f (patch) | |
| tree | 5c0783e7bc4d63936a17d12989edd1e2daf341c3 /libavcodec/pamenc.c | |
| parent | 40963ea9e9f8fbc178673c963f1d9662f3f20cfb (diff) | |
| parent | e82cbb69a768205d0bea2fc5b97377dff35d5e72 (diff) | |
| download | ffmpeg-072a62b50ab4e54ee55585dc06a8e313d713b39f.tar.gz | |
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>
Diffstat (limited to 'libavcodec/pamenc.c')
0 files changed, 0 insertions, 0 deletions