diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 20:51:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 20:53:57 +0100 |
| commit | 792ee2f7750cb158a8ca39f8b6a1aef5ba102551 (patch) | |
| tree | fd9f1f1b4f1f00553fe14cc7ce1461ebdd559425 /libavformat/matroska.c | |
| parent | a94d12b69027955f1b01aedffc8dd8c7e96a15cc (diff) | |
| parent | 0cbef38cb81833df36a35cbf2f14453be184c81c (diff) | |
| download | ffmpeg-792ee2f7750cb158a8ca39f8b6a1aef5ba102551.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
* qatar/release/0.6:
arm: Don't clobber callee saved registers in scalarproduct
See: a94d12b69027955f1b01aedffc8dd8c7e96a15cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.c')
0 files changed, 0 insertions, 0 deletions