aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Rui <bbcallen@gmail.com>2015-09-06 12:51:54 +0800
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-06 11:56:54 +0200
commit8cd24f8fe7b834b1b9197544100fe6cdda7d18d8 (patch)
treef19701204bd8045b75ba554b51654c86b52d8c26
parent7e853879cedd47a2a81ed45f855b478e4d40f9e5 (diff)
downloadffmpeg-8cd24f8fe7b834b1b9197544100fe6cdda7d18d8.tar.gz
avformat/async: replace strerror with av_err2str
Fixes CID1322337 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 929451c5cba5f05fa3511bc4cec2a8ebd4a41f5d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/async.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/async.c b/libavformat/async.c
index 60ea14c9e0..15355fb697 100644
--- a/libavformat/async.c
+++ b/libavformat/async.c
@@ -170,7 +170,7 @@ static int async_open(URLContext *h, const char *arg, int flags, AVDictionary **
c->interrupt_callback = h->interrupt_callback;
ret = ffurl_open(&c->inner, arg, flags, &interrupt_callback, options);
if (ret != 0) {
- av_log(h, AV_LOG_ERROR, "ffurl_open failed : %s, %s\n", strerror(ret), arg);
+ av_log(h, AV_LOG_ERROR, "ffurl_open failed : %s, %s\n", av_err2str(ret), arg);
goto url_fail;
}
@@ -179,25 +179,25 @@ static int async_open(URLContext *h, const char *arg, int flags, AVDictionary **
ret = pthread_mutex_init(&c->mutex, NULL);
if (ret != 0) {
- av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret));
+ av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", av_err2str(ret));
goto mutex_fail;
}
ret = pthread_cond_init(&c->cond_wakeup_main, NULL);
if (ret != 0) {
- av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", strerror(ret));
+ av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", av_err2str(ret));
goto cond_wakeup_main_fail;
}
ret = pthread_cond_init(&c->cond_wakeup_background, NULL);
if (ret != 0) {
- av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", strerror(ret));
+ av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", av_err2str(ret));
goto cond_wakeup_background_fail;
}
ret = pthread_create(&c->async_buffer_thread, NULL, async_buffer_task, h);
if (ret) {
- av_log(h, AV_LOG_ERROR, "pthread_create failed : %s\n", strerror(ret));
+ av_log(h, AV_LOG_ERROR, "pthread_create failed : %s\n", av_err2str(ret));
goto thread_fail;
}
@@ -229,7 +229,7 @@ static int async_close(URLContext *h)
ret = pthread_join(c->async_buffer_thread, NULL);
if (ret != 0)
- av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", strerror(ret));
+ av_log(h, AV_LOG_ERROR, "pthread_join(): %s\n", av_err2str(ret));
pthread_cond_destroy(&c->cond_wakeup_background);
pthread_cond_destroy(&c->cond_wakeup_main);