avdeviece: Read errno before av_log() as the callback from av_log() might affect...
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 11:19:10 +0000 (13:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 11:28:51 +0000 (13:28 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/caca.c

index a118064..ff54940 100644 (file)
@@ -135,8 +135,8 @@ static int caca_write_header(AVFormatContext *s)
 
     c->canvas = caca_create_canvas(c->window_width, c->window_height);
     if (!c->canvas) {
-        av_log(s, AV_LOG_ERROR, "Failed to create canvas\n");
         ret = AVERROR(errno);
+        av_log(s, AV_LOG_ERROR, "Failed to create canvas\n");
         goto fail;
     }
 
@@ -145,8 +145,8 @@ static int caca_write_header(AVFormatContext *s)
                                    bpp / 8 * encctx->width,
                                    0x0000ff, 0x00ff00, 0xff0000, 0);
     if (!c->dither) {
-        av_log(s, AV_LOG_ERROR, "Failed to create dither\n");
         ret =  AVERROR(errno);
+        av_log(s, AV_LOG_ERROR, "Failed to create dither\n");
         goto fail;
     }
 
@@ -164,9 +164,9 @@ static int caca_write_header(AVFormatContext *s)
 
     c->display = caca_create_display_with_driver(c->canvas, c->driver);
     if (!c->display) {
+        ret = AVERROR(errno);
         av_log(s, AV_LOG_ERROR, "Failed to create display\n");
         list_drivers(c);
-        ret = AVERROR(errno);
         goto fail;
     }