diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:53:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 04:53:54 +0100 |
| commit | cd25412f598404e2af9e70038cfc01f344ba043b (patch) | |
| tree | ff89428dfb48b614dc61e087e92f69d106ae2666 /libavformat/rtpdec_mpeg4.c | |
| parent | 0d487654ea8515d916f5d3b9e208fe39d9723fc5 (diff) | |
| parent | 2572d07c1f0abd9e2bf3ed20dbe35c58f1dd6ac4 (diff) | |
| download | ffmpeg-cd25412f598404e2af9e70038cfc01f344ba043b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
See: c01d1d4ddf4d8240427341af1c077f6455243576
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
0 files changed, 0 insertions, 0 deletions