diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:44:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:44:56 +0100 |
commit | 8be8dddd13f4da6e84a5315f95b4ff97775cee8e (patch) | |
tree | 1807a226b1b6eaad1f357d83bf7c42fee49f9860 /doc | |
parent | edba54630b6f6157802a167d04d4da4c33f52d72 (diff) | |
parent | 952d3187d8eda7067fcd73f1d5f17837fa65eb34 (diff) | |
download | ffmpeg-8be8dddd13f4da6e84a5315f95b4ff97775cee8e.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Add a missing # as prefix for an immediate constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions