]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0f8e6a f5fe6a4)
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Feb 2014 17:45:11 +0000 (18:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Feb 2014 17:45:16 +0000 (18:45 +0100)
* cehoyos/master:
  Do not warn about missing start time for unknown streams.
  Only complain about missing frame rate for video streams.

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.