[FFmpeg-cvslog] Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 02:04:41 2014 +0100| [85e1368f57a6611f0671f7581b82af34ac289494] | committer: Michael Niedermayer

Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'

* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
  avformat: Report the duration analysis reached

Conflicts:
	libavformat/utils.c

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

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