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 /libavformat/bintext.c | |
| 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 'libavformat/bintext.c')
0 files changed, 0 insertions, 0 deletions