Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:32:33 +0000 (23:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 22:32:33 +0000 (23:32 +0100)
commitca6fee7606866a0cb7676b95db4c462500cc8d2d
treeb0dd183baf4286b7aea00d2038877e46233107a4
parentc5c4e5839ad1459bdbd69ffa7d33949577662a6c
parentb9d2d6843a49f9df1d1ae1afe817d9b48c445919
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>
libavformat/tls.c