ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Oct 10
23:35:41 2014 +0200| [ae17a0c25873bd39c048c176dca2372f565276d9] | committer:
Michael Niedermayer
Merge commit '1d4579e38ecad578c86516fad2837a273d11b320'
* commit '1d4579e38ecad578c86516fad2837a273d11b320':
tcp: Add AVOption support
Conflicts:
libavformat/tcp.c
See: 2e009c6042bde419599ebed9165e597bbef23b2f
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae17a0c25873bd39c048c176dca2372f565276d9
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
