Michael Niedermayer ae17a0c258 Merge commit '1d4579e38ecad578c86516fad2837a273d11b320' ...

* commit '1d4579e38ecad578c86516fad2837a273d11b320':
  tcp: Add AVOption support

Conflicts:
	libavformat/tcp.c

See: 2e009c6042
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-11 00:39:01 +02:00

6.6 KiB

Raw Blame History

View Raw