diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:36:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:36:56 +0100 |
| commit | edba54630b6f6157802a167d04d4da4c33f52d72 (patch) | |
| tree | 7a8ad554a75e4a93397412c715c34d2b2f53e082 /ffserver.c | |
| parent | 3c00d4c5f0ae855981a0cf8addfae0c948414625 (diff) | |
| parent | 5dae4872357613a0b51120b54a4c5221e0ec3f69 (diff) | |
| download | ffmpeg-edba54630b6f6157802a167d04d4da4c33f52d72.tar.gz | |
Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
arm: Allow overriding the alignment set in the function macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions