Commit e5e8a26d authored by Diego Biurrun's avatar Diego Biurrun

libxvid: Use proper context in av_log() calls

parent 12db2832
...@@ -68,7 +68,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) ...@@ -68,7 +68,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s)
fd = ff_tempfile("xvidrc.", &tmp_name); fd = ff_tempfile("xvidrc.", &tmp_name);
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, "Cannot create temporary pass2 file.\n");
return fd; return fd;
} }
...@@ -106,7 +106,7 @@ av_cold int ff_xvid_rate_control_init(MpegEncContext *s) ...@@ -106,7 +106,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;
...@@ -141,7 +141,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run) ...@@ -141,7 +141,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;
} }
...@@ -151,7 +151,7 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run) ...@@ -151,7 +151,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