RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9' 

* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-31 16:10:12 -03:00
parent ef516efad4 e5e8a26dcf
commit 804ae6e30f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libxvid_rc.c
View File

@ -48,7 +48,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
fd = avpriv_tempfile("xvidrc.", &tmp_name, 0, s->avctx);
if (fd < 0) {
av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
av_log(s, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
return fd;
}
@ -69,7 +69,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
if (write(fd, tmp, strlen(tmp)) < 0) {
int ret = AVERROR(errno);
av_log(NULL, AV_LOG_ERROR, "Error %s writing 2pass logfile\n", av_err2str(ret));
av_log(s, AV_LOG_ERROR, "Error %s writing 2pass logfile\n", av_err2str(ret));
av_free(tmp_name);
close(fd);
return ret;
@ -92,7 +92,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
if (xvid_plugin_2pass2(NULL, XVID_PLG_CREATE, &xvid_plg_create,
&s->rc_context.non_lavc_opaque) < 0) {
av_log(NULL, AV_LOG_ERROR, "xvid_plugin_2pass2 failed\n");
av_log(s, AV_LOG_ERROR, "xvid_plugin_2pass2 failed\n");
return -1;
}
return 0;
@ -127,7 +127,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run)
xvid_plg_data.type = s->last_pict_type;
if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
XVID_PLG_AFTER, &xvid_plg_data, NULL)) {
av_log(s->avctx, AV_LOG_ERROR,
av_log(s, AV_LOG_ERROR,
"xvid_plugin_2pass2(handle, XVID_PLG_AFTER, ...) FAILED\n");
return -1;
}
@ -137,7 +137,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run)
xvid_plg_data.quant = 0;
if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
XVID_PLG_BEFORE, &xvid_plg_data, NULL)) {
av_log(s->avctx, AV_LOG_ERROR,
av_log(s, AV_LOG_ERROR,
"xvid_plugin_2pass2(handle, XVID_PLG_BEFORE, ...) FAILED\n");
return -1;
}