]> git.sesse.net Git - ffmpeg/commit
Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 14:36:55 +0000 (15:36 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 14:36:55 +0000 (15:36 +0100)
commit3c461eecd48ba2cf7616d98e6f99954de3ad4b06
tree79e33a31b208432d505b8857b0fa94a8c514245a
parent884dd175f061c03d7ba4896685e81bf8adc3ea94
parent1ceb07eb313c2d51383408025e57a2fe50ccd164
Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'

* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164':
  avformat_find_stream_info: move duration guessing after updating codec parameters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavformat/utils.c