Merge commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:56:05 +0000 (13:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:56:29 +0000 (13:56 +0200)
* commit 'f9157463dbcd2db8fe9504197c0c04d0d7d04f31':
  lavf: do not use the parser duration for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/utils.c

Simple merge