[FFmpeg-cvslog] avdeviece: Read errno before av_log() as the callback from av_log() might affect errno
Michael Niedermayer
git at videolan.org
Sat Oct 25 13:40:05 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 13:19:10 2014 +0200| [a63096953559ab40b09e125056d2a86bf6a354bb] | committer: Michael Niedermayer
avdeviece: Read errno before av_log() as the callback from av_log() might affect errno
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a63096953559ab40b09e125056d2a86bf6a354bb
---
libavdevice/caca.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavdevice/caca.c b/libavdevice/caca.c
index a118064..ff54940 100644
--- a/libavdevice/caca.c
+++ b/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;
}
More information about the ffmpeg-cvslog
mailing list