]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dddd06d f51b7e5)
Merge remote-tracking branch 'hexene/stagefright'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Apr 2012 23:58:26 +0000 (01:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Apr 2012 23:58:30 +0000 (01:58 +0200)
commit74e4bb691254e9d473bf1eac63ee7da4bbf0957e
tree9367a1092fd619d9a45a43bcd1df6d76674e08eatree | snapshot
parentdddd06d5b48664212ace4bb510757e9bb221b598commit | diff
parentf51b7e52a6b31e98a82ce48dddac9cabc1e62e04commit | diff
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>
configure diff1 | diff2 | blob | history
libavcodec/libstagefright.cpp diff1 | diff2 | blob | history
tools/build_libstagefright diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.