Michael Niedermayer 85e1368f57 Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf' ...

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

Conflicts:
	libavformat/utils.c

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

2014-03-12 02:11:47 +01:00

156 KiB

Raw Blame History

View Raw