Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 13:27:00 +0000 (15:27 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 13:59:44 +0000 (15:59 +0200)
commit5d75e4667742c851e21dcd6ce70154834fb7d22b
treedf3d4f2710c3480d2e81e3556a4f6ef407a9f86a
parent55816c926955799de1ebb7e0a03a0ebb5ea95bcc
parentdb7968bff4851c2be79b15b2cb2ae747424d2fca
Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'

* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
  avio: Allow custom IO users to get labels for the output bytestream

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
doc/APIchanges
libavformat/avio.h
libavformat/aviobuf.c
libavformat/mux.c
libavformat/version.h