summaryrefslogtreecommitdiffstats
path: root/video/decode/vd_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-16 20:40:02 +0100
committerwm4 <wm4@nowhere>2013-12-16 20:41:08 +0100
commit7dc7b900c622235d595337c988a0c75280084b7c (patch)
tree7f896555c9478430edd28d56fb6fde5691b0e643 /video/decode/vd_lavc.c
parent3e6cd3ef19aca7c79dfc73412f98b70b7de011b4 (diff)
downloadmpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.bz2
mpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.xz
Replace mp_tmsg, mp_dbg -> mp_msg, remove mp_gtext(), remove set_osd_tmsg
The tmsg stuff was for the internal gettext() based translation system, which nobody ever attempted to use and thus was removed. mp_gtext() and set_osd_tmsg() were also for this. mp_dbg was once enabled in debug mode only, but since we have log level for enabling debug messages, it seems utterly useless.
Diffstat (limited to 'video/decode/vd_lavc.c')
-rw-r--r--video/decode/vd_lavc.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index ed87a16b50..7e24cbcd90 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -218,7 +218,7 @@ static bool probe_hwdec(struct dec_video *vd, bool autoprobe, enum hwdec_type ap
{
struct vd_lavc_hwdec *hwdec = find_hwcodec(api);
if (!hwdec) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_V, "Requested hardware decoder not "
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "Requested hardware decoder not "
"compiled.\n");
return false;
}
@@ -229,10 +229,10 @@ static bool probe_hwdec(struct dec_video *vd, bool autoprobe, enum hwdec_type ap
*use_decoder = hw_decoder;
return true;
} else if (r == HWDEC_ERR_NO_CODEC) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_V, "Hardware decoder '%s' not found in "
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "Hardware decoder '%s' not found in "
"libavcodec.\n", hw_decoder ? hw_decoder : decoder);
} else if (r == HWDEC_ERR_NO_CTX && !autoprobe) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_WARN, "VO does not support requested "
+ mp_msg(MSGT_DECVIDEO, MSGL_WARN, "VO does not support requested "
"hardware decoder.\n");
}
return false;
@@ -247,7 +247,7 @@ static int init(struct dec_video *vd, const char *decoder)
ctx->non_dr1_pool = talloc_steal(ctx, mp_image_pool_new(16));
if (bstr_endswith0(bstr0(decoder), "_vdpau")) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_WARN, "VDPAU decoder '%s' was requested. "
+ mp_msg(MSGT_DECVIDEO, MSGL_WARN, "VDPAU decoder '%s' was requested. "
"This way of enabling hardware\ndecoding is not supported "
"anymore. Use --hwdec=vdpau instead.\nThe --hwdec-codec=... "
"option can be used to restrict which codecs are\nenabled, "
@@ -272,7 +272,7 @@ static int init(struct dec_video *vd, const char *decoder)
&hwdec, &hw_decoder);
}
} else {
- mp_tmsg(MSGT_DECVIDEO, MSGL_V, "Not trying to use hardware decoding: "
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "Not trying to use hardware decoding: "
"codec %s is blacklisted by user.\n", decoder);
}
@@ -280,15 +280,15 @@ static int init(struct dec_video *vd, const char *decoder)
ctx->software_fallback_decoder = talloc_strdup(ctx, decoder);
if (hw_decoder)
decoder = hw_decoder;
- mp_tmsg(MSGT_DECVIDEO, MSGL_INFO, "Trying to use hardware decoding.\n");
+ mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Trying to use hardware decoding.\n");
} else if (vd->opts->hwdec_api != HWDEC_NONE) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_INFO, "Using software decoding.\n");
+ mp_msg(MSGT_DECVIDEO, MSGL_INFO, "Using software decoding.\n");
}
init_avctx(vd, decoder, hwdec);
if (!ctx->avctx) {
if (ctx->software_fallback_decoder) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_ERR, "Error initializing hardware "
+ mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Error initializing hardware "
"decoding, falling back to software decoding.\n");
decoder = ctx->software_fallback_decoder;
ctx->software_fallback_decoder = NULL;
@@ -455,7 +455,7 @@ static void init_avctx(struct dec_video *vd, const char *decoder,
/* open it */
if (avcodec_open2(avctx, lavc_codec, NULL) < 0) {
- mp_tmsg(MSGT_DECVIDEO, MSGL_ERR, "Could not open codec.\n");
+ mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Could not open codec.\n");
uninit_avctx(vd);
return;
}
@@ -468,7 +468,7 @@ static void uninit_avctx(struct dec_video *vd)
if (avctx) {
if (avctx->codec && avcodec_close(avctx) < 0)
- mp_tmsg(MSGT_DECVIDEO, MSGL_ERR, "Could not close codec.\n");
+ mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Could not close codec.\n");
av_freep(&avctx->extradata);
av_freep(&avctx->slice_offset);
@@ -762,7 +762,7 @@ static int force_fallback(struct dec_video *vd)
vd_ffmpeg_ctx *ctx = vd->priv;
if (ctx->software_fallback_decoder) {
uninit_avctx(vd);
- mp_tmsg(MSGT_DECVIDEO, MSGL_ERR, "Error using hardware "
+ mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Error using hardware "
"decoding, falling back to software decoding.\n");
const char *decoder = ctx->software_fallback_decoder;
ctx->software_fallback_decoder = NULL;