aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-05 03:41:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-05 03:41:35 +0200
commit4216a5082bee6f5132702f5542d986ad4dcc1797 (patch)
tree09f6d7047367867438f83c54bab7829f8b1846de /tools
parent939d22a297bf8a7e422eb7ebfda96ec12c5427d3 (diff)
parente0bfe34ea8ccf333ec5b17961fd58eb575e74f8b (diff)
downloadffmpeg-4216a5082bee6f5132702f5542d986ad4dcc1797.tar.gz
Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'
* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b': libfdk-aacdec: Reduce the default decoder delay by one frame Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions