diff options
| -rw-r--r-- | libavformat/hdsenc.c | 11 | ||||
| -rw-r--r-- | libavformat/smoothstreamingenc.c | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/libavformat/hdsenc.c b/libavformat/hdsenc.c index fac5bcf417..1f77785f95 100644 --- a/libavformat/hdsenc.c +++ b/libavformat/hdsenc.c @@ -329,13 +329,10 @@ static int hds_write_header(AVFormatContext *s) int ret = 0, i; AVOutputFormat *oformat; - if (mkdir(s->filename, 0777)) { - int is_error = errno != EEXIST; - av_log(s, is_error ? AV_LOG_ERROR : AV_LOG_VERBOSE, "Failed to create directory %s\n", s->filename); - if (is_error) { - ret = AVERROR(errno); - goto fail; - } + if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) { + av_log(s, AV_LOG_ERROR , "Failed to create directory %s\n", s->filename); + ret = AVERROR(errno); + goto fail; } oformat = av_guess_format("flv", NULL, NULL); diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index 0781a0a370..d2b7c9e924 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -292,7 +292,7 @@ static int ism_write_header(AVFormatContext *s) int ret = 0, i; AVOutputFormat *oformat; - if (mkdir(s->filename, 0777) < 0) { + if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) { av_log(s, AV_LOG_ERROR, "mkdir failed\n"); ret = AVERROR(errno); goto fail; @@ -322,7 +322,7 @@ static int ism_write_header(AVFormatContext *s) goto fail; } snprintf(os->dirname, sizeof(os->dirname), "%s/QualityLevels(%d)", s->filename, s->streams[i]->codec->bit_rate); - if (mkdir(os->dirname, 0777) < 0) { + if (mkdir(os->dirname, 0777) == -1 && errno != EEXIST) { ret = AVERROR(errno); av_log(s, AV_LOG_ERROR, "mkdir failed\n"); goto fail; |