From 1e340af8d6a97cc013a2ad8ba77c77129625a34f Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Fri, 21 Jun 2013 12:47:01 +0200 Subject: avconv: drop additional strerror fallback strerror_r is called by av_strerror already. --- avconv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/avconv.c b/avconv.c index 480823506f..b490d4aa4a 100644 --- a/avconv.c +++ b/avconv.c @@ -1757,10 +1757,11 @@ static int transcode_init(void) oc->interrupt_callback = int_cb; if ((ret = avformat_write_header(oc, &output_files[i]->opts)) < 0) { char errbuf[128]; - const char *errbuf_ptr = errbuf; - if (av_strerror(ret, errbuf, sizeof(errbuf)) < 0) - errbuf_ptr = strerror(AVUNERROR(ret)); - snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?): %s", i, errbuf_ptr); + av_strerror(ret, errbuf, sizeof(errbuf)); + snprintf(error, sizeof(error), + "Could not write header for output file #%d " + "(incorrect codec parameters ?): %s", + i, errbuf); ret = AVERROR(EINVAL); goto dump_format; } -- cgit v1.2.3