avconv: drop additional strerror fallback
authorLuca Barbato <lu_zero@gentoo.org>
Fri, 21 Jun 2013 10:47:01 +0000 (12:47 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Sat, 22 Jun 2013 18:54:59 +0000 (20:54 +0200)
strerror_r is called by av_strerror already.

avconv.c

index 4808235..b490d4a 100644 (file)
--- 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;
         }