aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/aarch64/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-20 12:21:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-20 12:21:31 +0100
commit849f55368c3609d962adf5a729e192de9027b165 (patch)
tree3a1045bbd68ddf490c891e37349be2ffc96f89ce /libavresample/aarch64/Makefile
parentb86c2640f65444981718d74dedb85a249d66435c (diff)
parent48952116352ab03565cc14805e0f1d63cf0318fe (diff)
downloadffmpeg-849f55368c3609d962adf5a729e192de9027b165.tar.gz
Merge commit '48952116352ab03565cc14805e0f1d63cf0318fe' into release/2.4
* commit '48952116352ab03565cc14805e0f1d63cf0318fe': on2avc: check number of channels See: 550f3e9df3410b3dd975e590042c0d83e20a8da3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/aarch64/Makefile')
0 files changed, 0 insertions, 0 deletions