aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/ircamenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-30 20:18:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-30 20:18:14 +0200
commit92c49737522112e9cbe60725cd221046b74b7e1f (patch)
tree0053917de63f7619eae1b8275f9af65209c49cdf /libavformat/ircamenc.c
parentf4e08695602b89fd99af23ea934520737ee2d3d6 (diff)
parentb8e57113ecba5494d4bf47c29634392ea5fdb17b (diff)
downloadffmpeg-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