repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
realtextdec.c
diff --git
a/ffmpeg/libavcodec/realtextdec.c
b/ffmpeg/libavcodec/realtextdec.c
index 45788977b59818f5e6c153e1b24e627f6d7b4757..870953bf3ca624713b2c18a210ef2e69e2653b2b 100644
(file)
--- a/
ffmpeg/libavcodec/realtextdec.c
+++ b/
ffmpeg/libavcodec/realtextdec.c
@@
-52,13
+52,13
@@
static int rt_event_to_ass(AVBPrint *buf, const char *p)
}
p++;
}
}
p++;
}
- av_bprintf(buf, "\r\n");
return 0;
}
static int realtext_decode_frame(AVCodecContext *avctx,
void *data, int *got_sub_ptr, AVPacket *avpkt)
{
return 0;
}
static int realtext_decode_frame(AVCodecContext *avctx,
void *data, int *got_sub_ptr, AVPacket *avpkt)
{
+ int ret = 0;
AVSubtitle *sub = data;
const char *ptr = avpkt->data;
AVBPrint buf;
AVSubtitle *sub = data;
const char *ptr = avpkt->data;
AVBPrint buf;
@@
-67,9
+67,11
@@
static int realtext_decode_frame(AVCodecContext *avctx,
// note: no need to rescale pts & duration since they are in the same
// timebase as ASS (1/100)
if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr))
// note: no need to rescale pts & duration since they are in the same
// timebase as ASS (1/100)
if (ptr && avpkt->size > 0 && !rt_event_to_ass(&buf, ptr))
- ff_ass_add_rect(sub, buf.str, avpkt->pts, avpkt->duration, 0);
- *got_sub_ptr = sub->num_rects > 0;
+ ret = ff_ass_add_rect_bprint(sub, &buf, avpkt->pts, avpkt->duration);
av_bprint_finalize(&buf, NULL);
av_bprint_finalize(&buf, NULL);
+ if (ret < 0)
+ return ret;
+ *got_sub_ptr = sub->num_rects > 0;
return avpkt->size;
}
return avpkt->size;
}