aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-06 17:11:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-06 17:11:25 +0200
commit2a947c93826152625bf84b88fd529099913ac444 (patch)
tree451f8057f2d21042356602e2d4f916f399895342
parente93c46b3ccc1f30cd14bac6f3e4f6e4a831559c1 (diff)
parenteaa9693fed36c29dfbac896946de31eb186ac5d0 (diff)
downloadffmpeg-2a947c93826152625bf84b88fd529099913ac444.tar.gz
Merge commit 'eaa9693fed36c29dfbac896946de31eb186ac5d0' into release/2.2
* commit 'eaa9693fed36c29dfbac896946de31eb186ac5d0': alsdec: only adapt order for positive max_order See: 58d605ee9b3277289278dc40e022311f8e083833 Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions