Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:51:11 +0000 (15:51 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:51:11 +0000 (15:51 -0300)
commita295fee28496296a711715e4f5c93e4ad3168a71
treedbed49f59417e31d2c1a2b110efe393d8fe09fa8
parentf02bda3a03c1103a1c293ad030e6bcf089b21902
parent263358e0c9e7ffaa965fdbe986c8b18381d2b24a
Merge commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a'

* commit '263358e0c9e7ffaa965fdbe986c8b18381d2b24a':
  lavf: Drop deprecated AVFract type and related field

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