Merge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'
authorJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 22:49:20 +0000 (19:49 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 13 Apr 2017 22:49:20 +0000 (19:49 -0300)
commit34d7f337c1608c72be8c36355018dc894f0560ce
treed9546d39b216ab49903f3208d316837451411a9c
parentc5fd47fa8a300fc51489a47da94041609545803c
parent3f75e5116b900f1428aa13041fc7d6301bf1988a
Merge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'

* commit '3f75e5116b900f1428aa13041fc7d6301bf1988a':
  avio: Keep track of the amount of data written

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