diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:41:16 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:41:16 +0200 |
| commit | 3cf08e96fc85ec59b9da2dc79dc1eefc67f5c72d (patch) | |
| tree | 24a53de6e365472dd8758444d8139b68070b0677 /libavformat/http.c | |
| parent | 9ca19971bcdd1af39680c15a0319d57505b9542b (diff) | |
| parent | d9e8b47e3144262d6bc4681740411d4bdafad6ac (diff) | |
| download | ffmpeg-3cf08e96fc85ec59b9da2dc79dc1eefc67f5c72d.tar.gz | |
Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'
* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac':
des: add av_des_alloc()
Conflicts:
libavutil/des.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/http.c')
0 files changed, 0 insertions, 0 deletions