diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 02:04:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 02:11:47 +0100 |
| commit | 85e1368f57a6611f0671f7581b82af34ac289494 (patch) | |
| tree | 328ba846fe9347299b0094fbad14b4a7492b5e4f /tools/normalize.py | |
| parent | dbc3e1109cddd7ab653dce0f7758bad17b94803d (diff) | |
| parent | db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf (diff) | |
| download | ffmpeg-85e1368f57a6611f0671f7581b82af34ac289494.tar.gz | |
Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'
* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
avformat: Report the duration analysis reached
Conflicts:
libavformat/utils.c
See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/normalize.py')
0 files changed, 0 insertions, 0 deletions