diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:32:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:32:33 +0100 |
| commit | ca6fee7606866a0cb7676b95db4c462500cc8d2d (patch) | |
| tree | b0dd183baf4286b7aea00d2038877e46233107a4 /libavcodec/mjpegbdec.c | |
| parent | c5c4e5839ad1459bdbd69ffa7d33949577662a6c (diff) | |
| parent | b9d2d6843a49f9df1d1ae1afe817d9b48c445919 (diff) | |
| download | ffmpeg-ca6fee7606866a0cb7676b95db4c462500cc8d2d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mjpegbdec.c')
0 files changed, 0 insertions, 0 deletions