Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavdevice / caca.c

diff --git a/ffmpeg/libavdevice/caca.c b/ffmpeg/libavdevice/caca.c
index a11806478718e3d9ecfdc0382bc22b421ee754b8..ff54940d31f291c4a0128cf6824c1a3ce4519e18 100644 (file)
--- a/ffmpeg/libavdevice/caca.c
+++ b/ffmpeg/libavdevice/caca.c
@@ -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;
     }