diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 01:58:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 01:58:30 +0200 |
| commit | 74e4bb691254e9d473bf1eac63ee7da4bbf0957e (patch) | |
| tree | 9367a1092fd619d9a45a43bcd1df6d76674e08ea /configure | |
| parent | dddd06d5b48664212ace4bb510757e9bb221b598 (diff) | |
| parent | f51b7e52a6b31e98a82ce48dddac9cabc1e62e04 (diff) | |
| download | ffmpeg-74e4bb691254e9d473bf1eac63ee7da4bbf0957e.tar.gz | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3201,7 +3201,7 @@ enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schr enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex enabled libstagefright_h264 && require_cpp libstagefright_h264 "binder/ProcessState.h media/stagefright/MetaData.h media/stagefright/MediaBufferGroup.h media/stagefright/MediaDebug.h media/stagefright/MediaDefs.h - media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder + media/stagefright/OMXClient.h media/stagefright/OMXCodec.h" android::OMXClient -lstagefright -lmedia -lutils -lbinder -lgnustl_static enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg enabled libutvideo && require_cpp utvideo "stdint.h stdlib.h utvideo/utvideo.h utvideo/Codec.h" 'CCodec*' -lutvideo -lstdc++ enabled libv4l2 && require_pkg_config libv4l2 libv4l2.h v4l2_ioctl |