Merge commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:16:13 +0000 (17:16 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:16:13 +0000 (17:16 +0000)
commit2bf93dfd96549777701a2031c23dac2cdb7257ee
treecadc793862b46de547934822080d3f624e42da4b
parentcde68661bfa5a3049c08e79f1e38a3df597f18d8
parent21ab6fd01b9107d7171fc1a77c2bfacff845a97a
Merge commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a'

* commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a':
  lavf: document that passing valid timestamps to muxers is now mandatory

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