[FFmpeg-cvslog] lavfi/vf_ass: ignore subtitles decoding errors.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Feb 13 10:26:42 2013 +0100| [bb3303b94c1c3f29116d096f5a51c23dbb8f577a] | committer: Nicolas George

lavfi/vf_ass: ignore subtitles decoding errors.

A broken packet with invalid data in the middle of the stream
should not prevent from decoding the rest of the file.

Work around trac ticket #2264.

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

 libavfilter/vf_ass.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_ass.c b/libavfilter/vf_ass.c
index ade1b37..85dd5ce 100644
--- a/libavfilter/vf_ass.c
+++ b/libavfilter/vf_ass.c
@@ -318,14 +318,18 @@ static av_cold int init_subtitles(AVFilterContext *ctx, const char *args)
 
         if (pkt.stream_index == sid) {
             ret = avcodec_decode_subtitle2(dec_ctx, &sub, &got_subtitle, &pkt);
-            if (ret < 0 || !got_subtitle)
-                break;
+            if (ret < 0) {
+                av_log(ctx, AV_LOG_WARNING, "Error decoding: %s (ignored)\n",
+                       av_err2str(ret));
+            } else if (got_subtitle) {
+                /* TODO reindent */
             for (i = 0; i < sub.num_rects; i++) {
                 char *ass_line = sub.rects[i]->ass;
                 if (!ass_line)
                     break;
                 ass_process_data(ass->track, ass_line, strlen(ass_line));
             }
+            }
         }
         av_free_packet(&pkt);
         avsubtitle_free(&sub);