Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / samidec.c

diff --git a/ffmpeg/libavcodec/samidec.c b/ffmpeg/libavcodec/samidec.c
index 39ac6082bc6848ec4d284597b22c8e21deaa09b3..7705f93e7bd58f276eb42aa38dc073412ede4f97 100644 (file)
--- a/ffmpeg/libavcodec/samidec.c
+++ b/ffmpeg/libavcodec/samidec.c
@@ -104,7 +104,7 @@ static int sami_paragraph_to_ass(AVCodecContext *avctx, const char *src)
     av_bprint_clear(&sami->full);
     if (sami->source.len)
         av_bprintf(&sami->full, "{\\i1}%s{\\i0}\\N", sami->source.str);
-    av_bprintf(&sami->full, "%s\r\n", sami->content.str);
+    av_bprintf(&sami->full, "%s", sami->content.str);
 
 end:
     av_free(dupsrc);
@@ -122,7 +122,9 @@ static int sami_decode_frame(AVCodecContext *avctx,
         int ts_start     = av_rescale_q(avpkt->pts, avctx->time_base, (AVRational){1,100});
         int ts_duration  = avpkt->duration != -1 ?
                            av_rescale_q(avpkt->duration, avctx->time_base, (AVRational){1,100}) : -1;
-        ff_ass_add_rect(sub, sami->full.str, ts_start, ts_duration, 0);
+        int ret = ff_ass_add_rect_bprint(sub, &sami->full, ts_start, ts_duration);
+        if (ret < 0)
+            return ret;
     }
     *got_sub_ptr = sub->num_rects > 0;
     return avpkt->size;