1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavformat
Michael Niedermayer ca6fee7606 Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
* commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919':
  tls: Pass AVOptions dictionaries through to the chained protocol

Conflicts:
	libavformat/tls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28 23:32:33 +01:00
..
2014-12-18 00:10:35 +01:00
2015-02-26 02:06:10 +01:00
2015-02-16 19:59:04 +01:00
2015-02-27 16:55:34 +01:00
2015-01-30 09:33:49 +00:00
2015-02-17 12:16:43 -05:00
2014-12-18 23:27:07 +01:00
2015-02-15 18:20:54 +01:00
2014-12-20 00:17:43 +01:00
2015-02-21 23:37:24 +02:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00