aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/arm
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 18:25:27 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-02-24 18:25:27 +0000
commit8ae21fd95985377603c1a96e0086290fb866ab90 (patch)
tree5f9343adfb6241f5de29d23a99250a71a315cc97 /libavresample/arm
parent79b1a24b7ddd20ba68b0bb7a5ad41fe0dd77ffc8 (diff)
parent8caadfc53ddc55a269722ada65294f0ea8b609ac (diff)
downloadffmpeg-8ae21fd95985377603c1a96e0086290fb866ab90.tar.gz
Merge commit '8caadfc53ddc55a269722ada65294f0ea8b609ac'
* commit '8caadfc53ddc55a269722ada65294f0ea8b609ac': fate: Be silent when switching to Git branch Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavresample/arm')
0 files changed, 0 insertions, 0 deletions