[FFmpeg-cvslog] tls: Use ERR_get_error() in do_tls_poll

Martin Storsjö git at videolan.org
Wed Nov 9 03:31:06 CET 2011


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Nov  7 11:19:17 2011 +0200| [f38f3b88a5a74d0573dc299a512a87f6d579323b] | committer: Martin Storsjö

tls: Use ERR_get_error() in do_tls_poll

The return value ret isn't an error code that can be passed
to ERR_error_string().

This makes the error messages printed actually contain useful
information.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f38f3b88a5a74d0573dc299a512a87f6d579323b
---

 libavformat/tls.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 85bf46f..bd73feb 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -87,7 +87,7 @@ static int do_tls_poll(URLContext *h, int ret)
     } else if (ret == SSL_ERROR_WANT_WRITE) {
         p.events = POLLOUT;
     } else {
-        av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ret, NULL));
+        av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
         return AVERROR(EIO);
     }
 #endif



More information about the ffmpeg-cvslog mailing list