ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Feb 28
23:32:33 2015 +0100| [ca6fee7606866a0cb7676b95db4c462500cc8d2d] | committer:
Michael Niedermayer
Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
* commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919':
tls: Pass AVOptions dictionaries through to the chained protocol
Conflicts:
libavformat/tls.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca6fee7606866a0cb7676b95db4c462500cc8d2d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
