diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 19:06:37 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 20:50:13 +0100 |
| commit | 3846fc758789711347c0b11f87736b27fc6210a0 (patch) | |
| tree | e9b01445291326f0a026e0b002d78f1487d781b2 /sub/sd_lavc_conv.c | |
| parent | 92f9b514263d8becf670c19567826bd288595fe7 (diff) | |
| download | mpv-3846fc758789711347c0b11f87736b27fc6210a0.tar.bz2 mpv-3846fc758789711347c0b11f87736b27fc6210a0.tar.xz | |
sub/osd: mp_msg conversions
Diffstat (limited to 'sub/sd_lavc_conv.c')
| -rw-r--r-- | sub/sd_lavc_conv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c index 0fa3986e3d..566f412cf5 100644 --- a/sub/sd_lavc_conv.c +++ b/sub/sd_lavc_conv.c @@ -110,8 +110,7 @@ static int init(struct sd *sd) return 0; error: - mp_msg(MSGT_SUBREADER, MSGL_ERR, - "Could not open libavcodec subtitle converter\n"); + MP_FATAL(sd, "Could not open libavcodec subtitle converter\n"); av_free(avctx); talloc_free(priv); return -1; @@ -243,7 +242,7 @@ static void decode(struct sd *sd, struct demux_packet *packet) if (sd->codec && strcmp(sd->codec, "webvtt-webm") == 0) { if (parse_webvtt(&pkt, &parsed_pkt) < 0) { - mp_msg(MSGT_OSD, MSGL_ERR, "Error parsing subtitle\n"); + MP_ERR(sd, "Error parsing subtitle\n"); goto done; } pkt = parsed_pkt; @@ -251,7 +250,7 @@ static void decode(struct sd *sd, struct demux_packet *packet) ret = avcodec_decode_subtitle2(avctx, &sub, &got_sub, &pkt); if (ret < 0) { - mp_msg(MSGT_OSD, MSGL_ERR, "Error decoding subtitle\n"); + MP_ERR(sd, "Error decoding subtitle\n"); } else if (got_sub) { for (int i = 0; i < sub.num_rects; i++) { char *ass_line = sub.rects[i]->ass; |