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)
commitc8f3c3a5794d9a426b48af401437f385b0cc9b94
treec72338d0281684f269dac37ae6ecc8baa2b01bbd
parenta0f8e6ad67b0eeb32778db532d40f545c4f38191
parentf5fe6a4f79fafbe6a9ec0c40fc3f38f9f2279c8a
Merge remote-tracking branch 'cehoyos/master'

* 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>