diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-23 10:30:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-23 10:30:54 +0200 |
| commit | 7dc77613f6539a9f95dfd2587d9998a9595b55b5 (patch) | |
| tree | c6861fd1376876d78bdfb177853673c1d80073f4 /libavformat/aviobuf.c | |
| parent | abc8110f7e54fc009895c659ce2a977fb0d697c5 (diff) | |
| parent | 69e6702c013283d0e043e19e079c8eecb08bfd39 (diff) | |
| download | ffmpeg-7dc77613f6539a9f95dfd2587d9998a9595b55b5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Mangle external symbols properly in new vfp assembly files
See: 47d57f24e35f0e9694c615b81511dde4cda95c72
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aviobuf.c')
0 files changed, 0 insertions, 0 deletions