From 4ed83fe2e5f16b572b5c6a49a82f264d3f80a5e1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 18 Dec 2013 17:12:07 +0100 Subject: Remove the _ macro This was a gettext-style macro to mark strings that should be translated. --- common/encode_lavc.c | 8 ++++---- common/msg.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'common') diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 97a45ccbbe..c061ecaeaf 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -609,7 +609,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) { stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - mp_msg(MSGT_ENCODE, MSGL_WARN, _( + mp_msg(MSGT_ENCODE, MSGL_WARN, "\n\n" " ********************************************\n" " **** Experimental VIDEO codec selected! ****\n" @@ -625,7 +625,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) " Bear with it.\n" "- Crashes.\n" " Happens. Try varying options to work around.\n" - "If none of this helps you, try another codec in place of %s.\n\n"), + "If none of this helps you, try another codec in place of %s.\n\n", ctx->vc->name); } @@ -645,7 +645,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) { stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - mp_msg(MSGT_ENCODE, MSGL_WARN, _( + mp_msg(MSGT_ENCODE, MSGL_WARN, "\n\n" " ********************************************\n" " **** Experimental AUDIO codec selected! ****\n" @@ -661,7 +661,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) " Bear with it.\n" "- Crashes.\n" " Happens. Try varying options to work around.\n" - "If none of this helps you, try another codec in place of %s.\n\n"), + "If none of this helps you, try another codec in place of %s.\n\n", ctx->ac->name); } ret = avcodec_open2(stream->codec, ctx->ac, &ctx->aoptions); diff --git a/common/msg.h b/common/msg.h index 889d99ae62..7b93d831d8 100644 --- a/common/msg.h +++ b/common/msg.h @@ -27,9 +27,6 @@ struct mp_log; // defined in mplayer.c extern int verbose; -/* No-op macro to mark translated strings in the sources */ -#define _(x) x - // verbosity elevel: /* Only messages level MSGL_FATAL-MSGL_STATUS should be translated, -- cgit v1.2.3