aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/arm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-09 22:19:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-09 22:19:45 +0200
commit3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4 (patch)
tree4f0c33c423c6ef6929256e946b5bfd23cf251a11 /libswresample/arm
parent499ff6a052591d980ed36e10ac2019cef14c302b (diff)
parentf4c444e17d137c786f0ed2da0e5943df505d5f9e (diff)
downloadffmpeg-3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4.tar.gz
Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/arm')
0 files changed, 0 insertions, 0 deletions