diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-11 02:32:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-11 02:50:35 +0100 |
| commit | 6d91045d835635fe889f684bdf77f68e00b15d0b (patch) | |
| tree | ad30db96b3ae0e94efbb8878e0850bd2945bdaf6 /libavformat/mmsh.c | |
| parent | 554caed2d397e137286f2cc71c6bac477b41fa96 (diff) | |
| parent | 299809defb05eae093cb72da97dfbbb7e17e08fe (diff) | |
| download | ffmpeg-6d91045d835635fe889f684bdf77f68e00b15d0b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
doc: update libavfilter documentation
tls: Use the URLContext as logging context
aes: Avoid illegal read and don't generate more key than we use.
mpc7: Fix memset call in mpc7_decode_frame function
atrac1: use correct context for av_log()
apedec: consume the whole packet when copying to the decoder buffer.
apedec: do not needlessly copy s->samples to nblocks.
apedec: check output buffer size after calculating actual output size
apedec: remove unneeded entropy decoder normalization.
truespeech: use memmove() in truespeech_update_filters()
vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
vorbisdec: remove unneeded buf_size==0 check
vorbisdec: return proper error codes instead of made-up ones
http: Don't add a Range: bytes=0- header for POST
sunrast: Check for invalid/corrupted bitstream
http: Change the chunksize AVOption into chunked_post
http: Add encoding/decoding flags to the AVOptions
avconv: remove some codec-specific hacks
crypto: add decoding flag to options.
tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
...
Conflicts:
doc/libavfilter.texi
libavcodec/atrac1.c
libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mmsh.c')
| -rw-r--r-- | libavformat/mmsh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index f54a976e19..c710ad9ccc 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -28,6 +28,7 @@ #include <string.h> #include "libavutil/intreadwrite.h" #include "libavutil/avstring.h" +#include "libavutil/opt.h" #include "internal.h" #include "mms.h" #include "asf.h" @@ -246,7 +247,7 @@ static int mmsh_open_internal(URLContext *h, const char *uri, int flags, int tim CLIENTGUID "Connection: Close\r\n", host, port, mmsh->request_seq++); - ff_http_set_headers(mms->mms_hd, headers); + av_opt_set(mms->mms_hd->priv_data, "headers", headers, 0); err = ffurl_connect(mms->mms_hd); if (err) { @@ -293,7 +294,7 @@ static int mmsh_open_internal(URLContext *h, const char *uri, int flags, int tim goto fail; } av_dlog(NULL, "out_buffer is %s", headers); - ff_http_set_headers(mms->mms_hd, headers); + av_opt_set(mms->mms_hd->priv_data, "headers", headers, 0); err = ffurl_connect(mms->mms_hd); if (err) { |