[FFmpeg-cvslog] Merge commit '40665d27e38e6a2f65037878202bd1a398c7683e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 01:56:05 2014 +0100| [b83beb131f0d3fdb2d472665f5325f02aeac7d7e] | committer: Michael Niedermayer

Merge commit '40665d27e38e6a2f65037878202bd1a398c7683e'

* commit '40665d27e38e6a2f65037878202bd1a398c7683e':
  flvdec: Document how the duration is retrieved at the end of the file

Conflicts:
	libavformat/flvdec.c

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

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