October 2011 - ffmpeg-cvslog - lists.ffmpeg.org

avfiltergraph: change the syntax of avfilter_graph_parse()
by git＠videolan.org 18 May '12

18 May '12

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala(a)poste.it> | Sat Jun 11 15:16:02 2011 +0200| [6119b23a3662d1e106cdf69ef3171b2e7e1d495c] | committer: Stefano Sabatini avfiltergraph: change the syntax of avfilter_graph_parse() Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6119b23a3662d1e10… --- doc/APIchanges | 3 +++ ffmpeg.c | 2 +- ffplay.c | 2 +- libavfilter/avfilter.h | 4 ++-- libavfilter/avfiltergraph.h | 8 +++++--- libavfilter/graphparser.c | 20 ++++++++++---------- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 592c268..40efee8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-06-12 - xxxxxxx - lavfi 2.16.0 - avfilter_graph_parse() + Change avfilter_graph_parse() signature. + 2011-06-xx - xxxxxxx - lavu 51.6.0 - opt.h Add av_opt_flag_is_set(). diff --git a/ffmpeg.c b/ffmpeg.c index 35395a9..f69c054 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -418,7 +418,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) return ret; av_freep(&ost->avfilter); } else { diff --git a/ffplay.c b/ffplay.c index ebe9e05..c5f5f75 100644 --- a/ffplay.c +++ b/ffplay.c @@ -1708,7 +1708,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c inputs->pad_idx = 0; inputs->next = NULL; - if ((ret = avfilter_graph_parse(graph, vfilters, inputs, outputs, NULL)) < 0) + if ((ret = avfilter_graph_parse(graph, vfilters, &inputs, &outputs, NULL)) < 0) goto the_end; av_freep(&vfilters); } else { diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 64d76cc..fbd1dc4 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,8 +26,8 @@ #include "libavutil/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 15 -#define LIBAVFILTER_VERSION_MICRO 1 +#define LIBAVFILTER_VERSION_MINOR 16 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 23a7c51..538fd2c 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -112,12 +112,14 @@ typedef struct AVFilterInOut { * * @param graph the filter graph where to link the parsed graph context * @param filters string to be parsed - * @param inputs linked list to the inputs of the graph - * @param outputs linked list to the outputs of the graph + * @param inputs linked list to the inputs of the graph, may be NULL. + * It is updated to contain the list of open inputs after the parsing. + * @param outputs linked list to the outputs of the graph, may be NULL. + * It is updated to contain the list of open outputs after the parsing. * @return zero on success, a negative AVERROR code on error */ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *inputs, AVFilterInOut *outputs, + AVFilterInOut **inputs, AVFilterInOut **outputs, void *log_ctx); #endif /* AVFILTER_AVFILTERGRAPH_H */ diff --git a/libavfilter/graphparser.c b/libavfilter/graphparser.c index aa1f228..ea0c5dd 100644 --- a/libavfilter/graphparser.c +++ b/libavfilter/graphparser.c @@ -328,8 +328,8 @@ static int parse_outputs(const char **buf, AVFilterInOut **curr_inputs, } int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, - AVFilterInOut *open_inputs, - AVFilterInOut *open_outputs, void *log_ctx) + AVFilterInOut **open_inputs, AVFilterInOut **open_outputs, + void *log_ctx) { int index = 0, ret; char chr = 0; @@ -341,7 +341,7 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, const char *filterchain = filters; filters += strspn(filters, WHITESPACES); - if ((ret = parse_inputs(&filters, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&filters, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; if ((ret = parse_filter(&filter, &filters, graph, index, log_ctx)) < 0) @@ -350,14 +350,14 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, if (filter->input_count == 1 && !curr_inputs && !index) { /* First input can be omitted if it is "[in]" */ const char *tmp = "[in]"; - if ((ret = parse_inputs(&tmp, &curr_inputs, &open_outputs, log_ctx)) < 0) + if ((ret = parse_inputs(&tmp, &curr_inputs, open_outputs, log_ctx)) < 0) goto fail; } - if ((ret = link_filter_inouts(filter, &curr_inputs, &open_inputs, log_ctx)) < 0) + if ((ret = link_filter_inouts(filter, &curr_inputs, open_inputs, log_ctx)) < 0) goto fail; - if ((ret = parse_outputs(&filters, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&filters, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; @@ -382,10 +382,10 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, goto fail; } - if (open_inputs && !strcmp(open_inputs->name, "out") && curr_inputs) { + if (*open_inputs && !strcmp((*open_inputs)->name, "out") && curr_inputs) { /* Last output can be omitted if it is "[out]" */ const char *tmp = "[out]"; - if ((ret = parse_outputs(&tmp, &curr_inputs, &open_inputs, &open_outputs, + if ((ret = parse_outputs(&tmp, &curr_inputs, open_inputs, open_outputs, log_ctx)) < 0) goto fail; } @@ -396,8 +396,8 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters, for (; graph->filter_count > 0; graph->filter_count--) avfilter_free(graph->filters[graph->filter_count - 1]); av_freep(&graph->filters); - free_inout(open_inputs); - free_inout(open_outputs); + free_inout(*open_inputs); + free_inout(*open_outputs); free_inout(curr_inputs); return ret; }

2 1

avcodec: Change values of codec ids at the end of lists that dont exist outside ffmpeg yet so
by git＠videolan.org 02 Nov '11

02 Nov '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 24 21:40:23 2011 +0200| [4f587d163740d61b2571d8a0ed7ca1348078c989] | committer: Michael Niedermayer avcodec: Change values of codec ids at the end of lists that dont exist outside ffmpeg yet so they wont conflict when they get added to the fork with randomly changed order and values. Also add duplicate codec_ids to allow maintaining compatibility. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f587d163740d61b2… --- libavcodec/avcodec.h | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 401ce32..ad3dd01 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -212,12 +212,14 @@ enum CodecID { CODEC_ID_WMV3IMAGE, CODEC_ID_VC1IMAGE, #if LIBAVCODEC_VERSION_MAJOR == 53 - CODEC_ID_8SVX_RAW, - CODEC_ID_G2M, + CODEC_ID_G723_1_DEPRECATED, + CODEC_ID_G729_DEPRECATED, #endif CODEC_ID_UTVIDEO_DEPRECATED, CODEC_ID_UTVIDEO = 0x800, + CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), + /* various PCM "codecs" */ CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs CODEC_ID_PCM_S16LE= 0x10000, @@ -350,11 +352,12 @@ enum CodecID { CODEC_ID_QDMC, CODEC_ID_CELT, #if LIBAVCODEC_VERSION_MAJOR > 53 - CODEC_ID_G723_1, - CODEC_ID_G729, + CODEC_ID_G723_1_DEPRECATED, + CODEC_ID_G729_DEPRECATED, #endif CODEC_ID_G729 = 0x15800, CODEC_ID_G723_1= 0x15801, + CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'), /* subtitle codecs */ CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. @@ -367,14 +370,14 @@ enum CodecID { CODEC_ID_HDMV_PGS_SUBTITLE, CODEC_ID_DVB_TELETEXT, CODEC_ID_SRT, - CODEC_ID_MICRODVD, + CODEC_ID_MICRODVD = MKBETAG('m','D','V','D'), /* other specific kind of codecs (generally used for attachments) */ CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. CODEC_ID_TTF= 0x18000, - CODEC_ID_BINTEXT, - CODEC_ID_XBIN, - CODEC_ID_IDF, + CODEC_ID_BINTEXT = MKBETAG('B','T','X','T'), + CODEC_ID_XBIN = MKBETAG('X','B','I','N'), + CODEC_ID_IDF = MKBETAG( 0 ,'I','D','F'), CODEC_ID_PROBE= 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it

3 5

dirac: disable ff_horizontal_compose_haar0i_sse2() the function is not bitexact
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Nov 1 00:43:05 2011 +0100| [3e5ea9e471d8f08bfa0c6aa86241393a3d08066a] | committer: Michael Niedermayer dirac: disable ff_horizontal_compose_haar0i_sse2() the function is not bitexact Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e5ea9e471d8f08bf… --- libavcodec/x86/dwt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dwt.c index f3cc04c..cc0a711 100644 --- a/libavcodec/x86/dwt.c +++ b/libavcodec/x86/dwt.c @@ -175,7 +175,7 @@ void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) break; case DWT_DIRAC_HAAR0: d->vertical_compose = vertical_compose_haar_sse2; - d->horizontal_compose = ff_horizontal_compose_haar0i_sse2; +//MMXDISABLED d->horizontal_compose = ff_horizontal_compose_haar0i_sse2; break; case DWT_DIRAC_HAAR1: d->vertical_compose = vertical_compose_haar_sse2;

1 0

mmsh: do not try to seek to negative tiimestamps, it does not work
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 23:40:04 2011 +0100| [8af4ac5272e8eaff90c3102b9473bb09cc6f4201] | committer: Michael Niedermayer mmsh: do not try to seek to negative tiimestamps, it does not work Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8af4ac5272e8eaff9… --- libavformat/mmsh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index a7c85f6..ab7e9d9 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -373,7 +373,8 @@ static int64_t mmsh_read_seek(URLContext *h, int stream_index, MMSContext *mms = &mmsh->mms; int ret; - ret= mmsh_open_internal(h, mmsh->location, 0, timestamp, 0); + ret= mmsh_open_internal(h, mmsh->location, 0, FFMAX(timestamp, 0), 0); + if(ret>=0){ if (mms->mms_hd) ffurl_close(mms->mms_hd);

1 0

mp3enc: avoid truncating id3v1 tags by one byte
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-audio.com> | Mon Oct 31 15:11:37 2011 +0100| [0f39fa0279e12c7a174d1da9294bffd95cb15c4c] | committer: Michael Niedermayer mp3enc: avoid truncating id3v1 tags by one byte Avoid writing the trailing null-byte for id3v1 tags if length reaches max length. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f39fa0279e12c7a1… --- libavformat/mp3enc.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 793c9c6..f02872d 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -55,11 +55,12 @@ static int id3v1_create_tag(AVFormatContext *s, uint8_t *buf) buf[0] = 'T'; buf[1] = 'A'; buf[2] = 'G'; - count += id3v1_set_string(s, "TIT2", buf + 3, 30); //title - count += id3v1_set_string(s, "TPE1", buf + 33, 30); //author|artist - count += id3v1_set_string(s, "TALB", buf + 63, 30); //album - count += id3v1_set_string(s, "TDRL", buf + 93, 4); //date - count += id3v1_set_string(s, "comment", buf + 97, 30); + /* we knowingly overspecify each tag length by one byte to compensate for the mandatory null byte added by av_strlcpy */ + count += id3v1_set_string(s, "TIT2", buf + 3, 30 + 1); //title + count += id3v1_set_string(s, "TPE1", buf + 33, 30 + 1); //author|artist + count += id3v1_set_string(s, "TALB", buf + 63, 30 + 1); //album + count += id3v1_set_string(s, "TDRL", buf + 93, 4 + 1); //date + count += id3v1_set_string(s, "comment", buf + 97, 30 + 1); if ((tag = av_dict_get(s->metadata, "TRCK", NULL, 0))) { //track buf[125] = 0; buf[126] = atoi(tag->value);

1 0

mmsh_read_seek: skip header
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 22:59:56 2011 +0100| [33789862aa5b0afa037c52185462ad7ef8ab33c9] | committer: Michael Niedermayer mmsh_read_seek: skip header Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33789862aa5b0afa0… --- libavformat/mmsh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index 3b493ee..a7c85f6 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -380,6 +380,9 @@ static int64_t mmsh_read_seek(URLContext *h, int stream_index, av_freep(&mms->streams); av_freep(&mms->asf_header); av_free(mmsh); + mmsh = h->priv_data; + mms = &mmsh->mms; + mms->asf_header_read_size= mms->asf_header_size; }else h->priv_data= mmsh; return ret;

1 0

mmsh:_implement a minimal mmsh_seek() so the stream position can be found out.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 22:43:38 2011 +0100| [237bcaa27518e7439afc982112b83dedeab0cb6b] | committer: Michael Niedermayer mmsh:_implement a minimal mmsh_seek() so the stream position can be found out. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=237bcaa27518e7439… --- libavformat/mmsh.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index beef0a8..3b493ee 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -385,12 +385,22 @@ static int64_t mmsh_read_seek(URLContext *h, int stream_index, return ret; } +static int64_t mmsh_seek(URLContext *h, int64_t pos, int whence) +{ + MMSHContext *mmsh = h->priv_data; + MMSContext *mms = &mmsh->mms; + + if(pos == 0 && whence == SEEK_CUR) + return mms->asf_header_read_size + mms->remaining_in_len + mmsh->chunk_seq * mms->asf_packet_len; + return AVERROR(ENOSYS); +} + URLProtocol ff_mmsh_protocol = { .name = "mmsh", .url_open = mmsh_open, .url_read = mmsh_read, .url_write = NULL, - .url_seek = NULL, + .url_seek = mmsh_seek, .url_close = mmsh_close, .url_read_seek = mmsh_read_seek, };

1 0

asfdec: Check packet_replic_size earlier
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 22:42:45 2011 +0100| [60fcc19bff49e0b1972eae014afc087afd94a415] | committer: Michael Niedermayer asfdec: Check packet_replic_size earlier Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60fcc19bff49e0b19… --- libavformat/asfdec.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 3dc0b17..88cc3d5 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -822,6 +822,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); DO_2BITS(asf->packet_property, asf->packet_replic_size, 0); //printf("key:%d stream:%d seq:%d offset:%d replic_size:%d\n", asf->packet_key_frame, asf->stream_index, asf->packet_seq, //asf->packet_frag_offset, asf->packet_replic_size); + if (rsize+asf->packet_replic_size > asf->packet_size_left) { + av_log(s, AV_LOG_ERROR, "packet_replic_size %d is invalid\n", asf->packet_replic_size); + return -1; + } if (asf->packet_replic_size >= 8) { asf->packet_obj_size = avio_rl32(pb); if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ @@ -856,10 +860,6 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); return -1; } - if (rsize > asf->packet_size_left) { - av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); - return -1; - } if (asf->packet_flags & 0x01) { DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal if (rsize > asf->packet_size_left) {

1 0

mmsh: split out mmsh_open_internal()
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 20:49:23 2011 +0100| [86a4e55e663c144dd355b4320be4dc4c95b726eb] | committer: Michael Niedermayer mmsh: split out mmsh_open_internal() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86a4e55e663c144dd… --- libavformat/mmsh.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index b63ad02..94dc167 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -211,7 +211,7 @@ static int get_http_header_data(MMSHContext *mmsh) } } -static int mmsh_open(URLContext *h, const char *uri, int flags) +static int mmsh_open_internal(URLContext *h, const char *uri, int flags, int timestamp, int64_t pos) { int i, port, err; char httpname[256], path[256], host[128]; @@ -284,8 +284,9 @@ static int mmsh_open(URLContext *h, const char *uri, int flags) CLIENTGUID "Pragma: stream-switch-count=%d\r\n" "Pragma: stream-switch-entry=%s\r\n" + "Pragma: no-cache,rate=1.000000,stream-time=%u" "Connection: Close\r\n", - host, port, mmsh->request_seq++, mms->stream_num, stream_selection); + host, port, mmsh->request_seq++, mms->stream_num, stream_selection, timestamp); av_freep(&stream_selection); if (err < 0) { av_log(NULL, AV_LOG_ERROR, "Build play request failed!\n"); @@ -314,6 +315,11 @@ fail: return err; } +static int mmsh_open(URLContext *h, const char *uri, int flags) +{ + mmsh_open_internal(h, uri, flags, 0, 0); +} + static int handle_chunk_type(MMSHContext *mmsh) { MMSContext *mms = &mmsh->mms;

1 0

mmsh: move location storage into context
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Oct 31 20:45:12 2011 +0100| [aedb87c57edf6fa7e7046da86540d9cf11b84f65] | committer: Michael Niedermayer mmsh: move location storage into context Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aedb87c57edf6fa7e… --- libavformat/mmsh.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index 029baed..b63ad02 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -55,6 +55,7 @@ typedef enum { typedef struct { MMSContext mms; + uint8_t location[1024]; int request_seq; ///< request packet sequence int chunk_seq; ///< data packet sequence } MMSHContext; @@ -213,7 +214,7 @@ static int get_http_header_data(MMSHContext *mmsh) static int mmsh_open(URLContext *h, const char *uri, int flags) { int i, port, err; - char httpname[256], path[256], host[128], location[1024]; + char httpname[256], path[256], host[128]; char *stream_selection = NULL; char headers[1024]; MMSHContext *mmsh; @@ -224,10 +225,10 @@ static int mmsh_open(URLContext *h, const char *uri, int flags) return AVERROR(ENOMEM); mmsh->request_seq = h->is_streamed = 1; mms = &mmsh->mms; - av_strlcpy(location, uri, sizeof(location)); + av_strlcpy(mmsh->location, uri, sizeof(mmsh->location)); av_url_split(NULL, 0, NULL, 0, - host, sizeof(host), &port, path, sizeof(path), location); + host, sizeof(host), &port, path, sizeof(path), mmsh->location); if (port<0) port = 80; // default mmsh protocol port ff_url_join(httpname, sizeof(httpname), "http", NULL, host, port, "%s", path);

1 0