diff options
Diffstat (limited to 'libvo/vo_yuv4mpeg.c')
-rw-r--r-- | libvo/vo_yuv4mpeg.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index 3bddcafaaa..8b9900d270 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -50,7 +50,6 @@ #include "video_out_internal.h" #include "mp_msg.h" -#include "help_mp.h" #include "sub.h" @@ -116,16 +115,16 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, { if (height % 4) { - mp_msg(MSGT_VO,MSGL_FATAL, - MSGTR_VO_YUV4MPEG_InterlacedHeightDivisibleBy4); + mp_tmsg(MSGT_VO,MSGL_FATAL, + "Interlaced mode requires image height to be divisible by 4."); return -1; } } if (width % 2) { - mp_msg(MSGT_VO,MSGL_FATAL, - MSGTR_VO_YUV4MPEG_WidthDivisibleBy2); + mp_tmsg(MSGT_VO,MSGL_FATAL, + "Image width must be divisible by 2."); return -1; } @@ -135,8 +134,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, yuv_out = fopen(yuv_filename, "wb"); if (!yuv_out || image == 0) { - mp_msg(MSGT_VO,MSGL_FATAL, - MSGTR_VO_YUV4MPEG_OutFileOpenError, + mp_tmsg(MSGT_VO,MSGL_FATAL, + "Can't get memory or file handle to write \"%s\"!", yuv_filename); return -1; } @@ -167,8 +166,8 @@ static void draw_osd(void) static void vo_y4m_write(const void *ptr, const size_t num_bytes) { if (fwrite(ptr, 1, num_bytes, yuv_out) != num_bytes) - mp_msg(MSGT_VO,MSGL_ERR, - MSGTR_VO_YUV4MPEG_OutFileWriteError); + mp_tmsg(MSGT_VO,MSGL_ERR, + "Error writing image to output!"); } static int write_last_frame(void) @@ -270,7 +269,7 @@ static int preinit(const char *arg) il_bf = 0; yuv_filename = strdup("stream.yuv"); if (subopt_parse(arg, subopts) != 0) { - mp_msg(MSGT_VO, MSGL_FATAL, MSGTR_VO_YUV4MPEG_UnknownSubDev, arg); + mp_tmsg(MSGT_VO, MSGL_FATAL, "Unknown subdevice: %s", arg); return -1; } @@ -284,22 +283,22 @@ static int preinit(const char *arg) switch (config_interlace) { case Y4M_ILACE_TOP_FIRST: - mp_msg(MSGT_VO,MSGL_STATUS, - MSGTR_VO_YUV4MPEG_InterlacedTFFMode); + mp_tmsg(MSGT_VO,MSGL_STATUS, + "Using interlaced output mode, top-field first."); break; case Y4M_ILACE_BOTTOM_FIRST: - mp_msg(MSGT_VO,MSGL_STATUS, - MSGTR_VO_YUV4MPEG_InterlacedBFFMode); + mp_tmsg(MSGT_VO,MSGL_STATUS, + "Using interlaced output mode, bottom-field first."); break; default: - mp_msg(MSGT_VO,MSGL_STATUS, - MSGTR_VO_YUV4MPEG_ProgressiveMode); + mp_tmsg(MSGT_VO,MSGL_STATUS, + "Using (default) progressive frame mode."); break; } return 0; } -static int control(uint32_t request, void *data, ...) +static int control(uint32_t request, void *data) { switch (request) { case VOCTRL_QUERY_FORMAT: |