aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>2016-06-23 15:27:00 +0200
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>2016-06-23 15:59:44 +0200
commit5d75e4667742c851e21dcd6ce70154834fb7d22b (patch)
treedf3d4f2710c3480d2e81e3556a4f6ef407a9f86a /Makefile
parent55816c926955799de1ebb7e0a03a0ebb5ea95bcc (diff)
parentdb7968bff4851c2be79b15b2cb2ae747424d2fca (diff)
downloadffmpeg-5d75e4667742c851e21dcd6ce70154834fb7d22b.tar.gz
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions