[FFmpeg-cvslog] Merge commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c' into release/2.2
Michael Niedermayer
git at videolan.org
Sun Mar 16 04:12:16 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 04:06:49 2014 +0100| [9ae2aaea501d6fe743b24e732dffd80134c36698] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ae2aaea501d6fe743b24e732dffd80134c36698
---
More information about the ffmpeg-cvslog
mailing list