Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:54:22 +0000 (15:54 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:54:22 +0000 (15:54 -0300)
commit1198e34e118966d6e64be5801efafad2f629f4ce
treec62994658ef1d8c54e8f941a1410bd2bd49b589a
parenta295fee28496296a711715e4f5c93e4ad3168a71
parent63fe79a3368cc53e6faf7fa265a9a1a8bec46a88
Merge commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88'

* commit '63fe79a3368cc53e6faf7fa265a9a1a8bec46a88':
  lavf: Drop deprecated hint to set muxer timebase

Merged-by: James Almer <jamrial@gmail.com>
libavformat/mux.c
libavformat/version.h