diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:18:14 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:18:14 +0200 |
commit | 92c49737522112e9cbe60725cd221046b74b7e1f (patch) | |
tree | 0053917de63f7619eae1b8275f9af65209c49cdf /libavformat/ircamenc.c | |
parent | f4e08695602b89fd99af23ea934520737ee2d3d6 (diff) | |
parent | b8e57113ecba5494d4bf47c29634392ea5fdb17b (diff) | |
download | ffmpeg-92c49737522112e9cbe60725cd221046b74b7e1f.tar.gz |
Merge commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b' into release/2.2
* commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b':
arm: Avoid using the 'setend' instruction on ARMv7 and newer
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ircamenc.c')
0 files changed, 0 insertions, 0 deletions