|
|
@ -187,7 +187,11 @@ int avformat_alloc_output_context2(AVFormatContext **avctx, AVOutputFormat *ofor |
|
|
|
s->priv_data = NULL; |
|
|
|
s->priv_data = NULL; |
|
|
|
|
|
|
|
|
|
|
|
if (filename) { |
|
|
|
if (filename) { |
|
|
|
|
|
|
|
#if FF_API_FORMAT_FILENAME |
|
|
|
|
|
|
|
FF_DISABLE_DEPRECATION_WARNINGS |
|
|
|
av_strlcpy(s->filename, filename, sizeof(s->filename)); |
|
|
|
av_strlcpy(s->filename, filename, sizeof(s->filename)); |
|
|
|
|
|
|
|
FF_ENABLE_DEPRECATION_WARNINGS |
|
|
|
|
|
|
|
#endif |
|
|
|
if (!(s->url = av_strdup(filename))) |
|
|
|
if (!(s->url = av_strdup(filename))) |
|
|
|
goto nomem; |
|
|
|
goto nomem; |
|
|
|
|
|
|
|
|
|
|
@ -255,7 +259,13 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) |
|
|
|
(ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) |
|
|
|
(ret = av_opt_set_dict2(s->priv_data, &tmp, AV_OPT_SEARCH_CHILDREN)) < 0) |
|
|
|
goto fail; |
|
|
|
goto fail; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if FF_API_FORMAT_FILENAME |
|
|
|
|
|
|
|
FF_DISABLE_DEPRECATION_WARNINGS |
|
|
|
if (!s->url && !(s->url = av_strdup(s->filename))) { |
|
|
|
if (!s->url && !(s->url = av_strdup(s->filename))) { |
|
|
|
|
|
|
|
FF_ENABLE_DEPRECATION_WARNINGS |
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
if (!s->url && !(s->url = av_strdup(""))) { |
|
|
|
|
|
|
|
#endif |
|
|
|
ret = AVERROR(ENOMEM); |
|
|
|
ret = AVERROR(ENOMEM); |
|
|
|
goto fail; |
|
|
|
goto fail; |
|
|
|
} |
|
|
|
} |
|
|
|