Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:48:25 +0000 (15:48 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:48:25 +0000 (15:48 -0300)
commitf02bda3a03c1103a1c293ad030e6bcf089b21902
treeddea22aa1a1a60944f3c28855a333213da66e622
parentd1b1a65662e3657ba05aa76023dde19712470f58
parent5e71299758d3aa7c93c3cca618a8e048a9483794
Merge commit '5e71299758d3aa7c93c3cca618a8e048a9483794'

* commit '5e71299758d3aa7c93c3cca618a8e048a9483794':
  lavf: Drop deprecated bitexact functionality

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