aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-10 20:59:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-10 20:59:44 +0100
commit31801ded9a863252a7e64d0edc4e0c6c3adb72ad (patch)
tree922e79654420635cc5bd780deb752eec02957fce /ffmpeg.c
parent5ab6f0fe5abf8c5fccede33f7b68c9f3a3864e3a (diff)
parentd7b786e9a1e228f4da30fb8dbf1db065629ea677 (diff)
downloadffmpeg-31801ded9a863252a7e64d0edc4e0c6c3adb72ad.tar.gz
Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright: libstagefright: fix build Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions