diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 04:06:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 04:06:49 +0100 |
| commit | 9ae2aaea501d6fe743b24e732dffd80134c36698 (patch) | |
| tree | f89f61d63052aa912b83a9c621f453e8d3bfb606 /doc/ffmpeg-bitstream-filters.texi | |
| parent | 251331491299ae89732203edc16d9b6a06f2bd79 (diff) | |
| parent | cd874cf8e69f1b31986fd978577994b45efa3d5c (diff) | |
| download | ffmpeg-9ae2aaea501d6fe743b24e732dffd80134c36698.tar.gz | |
Merge commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c' into release/2.2
* commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c':
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-bitstream-filters.texi')
0 files changed, 0 insertions, 0 deletions