ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Oct 25 13:18:47 2014 +0200| [dd5c2fe17727cba76122ee9a4cfc1ad07a2dd099] | committer: Michael Niedermayer
avcodec: Read errno before av_log() as the callback from av_log() might affect errno Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd5c2fe17727cba76122ee9a4cfc1ad07a2dd099 --- libavcodec/libxvid_rc.c | 3 ++- libavcodec/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index 4ee4d82..f92bef1 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -68,10 +68,11 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) (rce->header_bits + rce->mv_bits + 7) / 8); if (write(fd, tmp, strlen(tmp)) < 0) { + int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Error %s writing 2pass logfile\n", strerror(errno)); av_free(tmp_name); close(fd); - return AVERROR(errno); + return ret; } } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 4ef2ac6..b6ae1c0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1664,9 +1664,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code #if CONFIG_ICONV iconv_t cd = iconv_open("UTF-8", avctx->sub_charenc); if (cd == (iconv_t)-1) { + ret = AVERROR(errno); av_log(avctx, AV_LOG_ERROR, "Unable to open iconv context " "with input character encoding \"%s\"\n", avctx->sub_charenc); - ret = AVERROR(errno); goto free_and_end; } iconv_close(cd); @@ -2649,10 +2649,10 @@ static int recode_subtitle(AVCodecContext *avctx, if (iconv(cd, &inb, &inl, &outb, &outl) == (size_t)-1 || iconv(cd, NULL, NULL, &outb, &outl) == (size_t)-1 || outl >= outpkt->size || inl != 0) { + ret = FFMIN(AVERROR(errno), -1); av_log(avctx, AV_LOG_ERROR, "Unable to recode subtitle event \"%s\" " "from %s to UTF-8\n", inpkt->data, avctx->sub_charenc); av_free_packet(&tmp); - ret = AVERROR(errno); goto end; } outpkt->size -= outl; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog