[FFmpeg-cvslog] Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul  5 03:41:35 2014 +0200| [4216a5082bee6f5132702f5542d986ad4dcc1797] | committer: Michael Niedermayer

Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'

* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b':
  libfdk-aacdec: Reduce the default decoder delay by one frame

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4216a5082bee6f5132702f5542d986ad4dcc1797
---