diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-02 17:44:28 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-02 17:44:28 -0300 |
| commit | 26148e923613e718787c6fc4bf3f64e8909f597c (patch) | |
| tree | bd02570dca19753db1f32ec58543e459b809073e /libavcodec/indeo4.c | |
| parent | ce265b0bf5d0c77a092a1f5fbeb652c7cdea5fc7 (diff) | |
| parent | 4130e05ff496667565ff7c386a514bd46434eddf (diff) | |
| download | ffmpeg-26148e923613e718787c6fc4bf3f64e8909f597c.tar.gz | |
Merge commit '4130e05ff496667565ff7c386a514bd46434eddf'
* commit '4130e05ff496667565ff7c386a514bd46434eddf':
libavformat: add mbedTLS based TLS
This commit is a noop, see c24d247e2c2ccd13fda09fe4194bf2ff0eb42256
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/indeo4.c')
0 files changed, 0 insertions, 0 deletions