[FFmpeg-cvslog] lavf/srtdec: do not try to queue empty subtitle chunks.

Clément Bœsch git at videolan.org
Sun Jan 27 16:33:11 CET 2013


ffmpeg | branch: release/1.1 | Clément Bœsch <ubitux at gmail.com> | Sun Jan 27 20:25:21 2013 +0900| [fb876e457279ba5c9b3ca153955a3dec7e9030de] | committer: Carl Eugen Hoyos

lavf/srtdec: do not try to queue empty subtitle chunks.

Regression since 3af3a30.
Fixes Ticket2167.
(cherry picked from commit f2b6aabd3da7d0d15c7cea0a9fb649b530e2d3cb)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb876e457279ba5c9b3ca153955a3dec7e9030de
---

 libavformat/srtdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 809d1d0..76e06e4 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -100,6 +100,8 @@ static int srt_read_header(AVFormatContext *s)
             pts = get_pts(&ptr, &duration, &x1, &y1, &x2, &y2);
             if (pts != AV_NOPTS_VALUE) {
                 int len = buf.len - (ptr - buf.str);
+                if (len <= 0)
+                    continue;
                 sub = ff_subtitles_queue_insert(&srt->q, ptr, len, 0);
                 if (!sub) {
                     res = AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list