virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avformat: Read errno before av_log() as the callback from av_log() might affect errno

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-25 13:48:56 +02:00
parent af03ba9aa2
commit e7513e1286
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/libsmbclient.c
View File

@ -50,12 +50,14 @@ static av_cold int libsmbc_connect(URLContext *h)
libsmbc->ctx = smbc_new_context();
if (!libsmbc->ctx) {
int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Cannot create context: %s.\n", strerror(errno));
return AVERROR(errno);
return ret;
}
if (!smbc_init_context(libsmbc->ctx)) {
int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Cannot initialize context: %s.\n", strerror(errno));
return AVERROR(errno);
return ret;
}
smbc_set_context(libsmbc->ctx);
@ -68,8 +70,9 @@ static av_cold int libsmbc_connect(URLContext *h)
smbc_setWorkgroup(libsmbc->ctx, libsmbc->workgroup);
if (smbc_init(NULL, 0) < 0) {
int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Initialization failed: %s\n", strerror(errno));
return AVERROR(errno);
return ret;
}
return 0;
}
@ -157,8 +160,9 @@ static int libsmbc_read(URLContext *h, unsigned char *buf, int size)
int bytes_read;
if ((bytes_read = smbc_read(libsmbc->fd, buf, size)) < 0) {
int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Read error: %s\n", strerror(errno));
return AVERROR(errno);
return ret;
}
return bytes_read;
@ -170,8 +174,9 @@ static int libsmbc_write(URLContext *h, const unsigned char *buf, int size)
int bytes_written;
if ((bytes_written = smbc_write(libsmbc->fd, buf, size)) < 0) {
int ret = AVERROR(errno);
av_log(h, AV_LOG_ERROR, "Write error: %s\n", strerror(errno));
return AVERROR(errno);
return ret;
}
return bytes_written;

2
libavformat/smoothstreamingenc.c
View File

@ -293,8 +293,8 @@ static int ism_write_header(AVFormatContext *s)
AVOutputFormat *oformat;
if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) {
av_log(s, AV_LOG_ERROR, "mkdir failed\n");
ret = AVERROR(errno);
av_log(s, AV_LOG_ERROR, "mkdir failed\n");
goto fail;
}