Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 01:41:35 +0000 (03:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 01:41:35 +0000 (03:41 +0200)
commit4216a5082bee6f5132702f5542d986ad4dcc1797
tree09f6d7047367867438f83c54bab7829f8b1846de
parent939d22a297bf8a7e422eb7ebfda96ec12c5427d3
parente0bfe34ea8ccf333ec5b17961fd58eb575e74f8b
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>
libavcodec/libfdk-aacdec.c
libavcodec/version.h