eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
cd3d0d5422356a748e8b20edc79c22182cca7ec1
ffmpeg/libavformat/tls.c
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

13 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink