aboutsummaryrefslogtreecommitdiffstats
path: root/tools/trasher.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-06 03:34:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-06 03:35:00 +0200
commit146648771c953cf50d98617eaa250ebdf423ffaf (patch)
tree948bd0533f8c92ec1423ce2b34a325d54f4b1e14 /tools/trasher.c
parent843b860ad974752ef3fe00c75081c3bda3b56a97 (diff)
parent378ee3bad5b99e8f90864af9bc851590e0f64825 (diff)
downloadffmpeg-146648771c953cf50d98617eaa250ebdf423ffaf.tar.gz
Merge commit '378ee3bad5b99e8f90864af9bc851590e0f64825' into release/2.4
* commit '378ee3bad5b99e8f90864af9bc851590e0f64825': alsdec: only adapt order for positive max_order See: 58d605ee9b3277289278dc40e022311f8e083833 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/trasher.c')
0 files changed, 0 insertions, 0 deletions