Commit 804ae6e3 authored by James Almer's avatar James Almer

Merge commit 'e5e8a26d'

* commit 'e5e8a26d':
  libxvid: Use proper context in av_log() calls
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents ef516efa e5e8a26d
...@@ -48,7 +48,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) ...@@ -48,7 +48,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
fd = avpriv_tempfile("xvidrc.", &tmp_name, 0, s->avctx); fd = avpriv_tempfile("xvidrc.", &tmp_name, 0, s->avctx);
if (fd < 0) { 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; return fd;
} }
...@@ -69,7 +69,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) ...@@ -69,7 +69,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
if (write(fd, tmp, strlen(tmp)) < 0) { if (write(fd, tmp, strlen(tmp)) < 0) {
int ret = AVERROR(errno); 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); av_free(tmp_name);
close(fd); close(fd);
return ret; return ret;
...@@ -92,7 +92,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) ...@@ -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, if (xvid_plugin_2pass2(NULL, XVID_PLG_CREATE, &xvid_plg_create,
&s->rc_context.non_lavc_opaque) < 0) { &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 -1;
} }
return 0; return 0;
...@@ -127,7 +127,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run) ...@@ -127,7 +127,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run)
xvid_plg_data.type = s->last_pict_type; xvid_plg_data.type = s->last_pict_type;
if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
XVID_PLG_AFTER, &xvid_plg_data, NULL)) { 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"); "xvid_plugin_2pass2(handle, XVID_PLG_AFTER, ...) FAILED\n");
return -1; return -1;
} }
...@@ -137,7 +137,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run) ...@@ -137,7 +137,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run)
xvid_plg_data.quant = 0; xvid_plg_data.quant = 0;
if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque, if (xvid_plugin_2pass2(s->rc_context.non_lavc_opaque,
XVID_PLG_BEFORE, &xvid_plg_data, NULL)) { 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"); "xvid_plugin_2pass2(handle, XVID_PLG_BEFORE, ...) FAILED\n");
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment