Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:04:41 +0000 (02:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:11:47 +0000 (02:11 +0100)
commit85e1368f57a6611f0671f7581b82af34ac289494
tree328ba846fe9347299b0094fbad14b4a7492b5e4f
parentdbc3e1109cddd7ab653dce0f7758bad17b94803d
parentdb9d39b4b5e5a3c20aeecf787ddeadd88f4906cf
Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'

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

Conflicts:
libavformat/utils.c

See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c