[FFmpeg-cvslog] avcodec/ccaption_dec: Fix mixed declarations and code

Michael Niedermayer git at videolan.org
Tue Jan 19 14:15:44 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jan 19 13:11:37 2016 +0100| [22f64c23244f4b83f59b866387ebeb8edca21b0d] | committer: Michael Niedermayer

avcodec/ccaption_dec: Fix mixed declarations and code

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/ccaption_dec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
index 330ea6a..790f071 100644
--- a/libavcodec/ccaption_dec.c
+++ b/libavcodec/ccaption_dec.c
@@ -625,13 +625,14 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
 
     if (ctx->real_time && ctx->screen_touched &&
         avpkt->pts > ctx->last_real_time + av_rescale_q(20, ass_tb, avctx->time_base)) {
+        int start_time;
         ctx->last_real_time = avpkt->pts;
         ctx->screen_touched = 0;
 
         capture_screen(ctx);
         ctx->buffer_changed = 0;
 
-        int start_time = av_rescale_q(avpkt->pts, avctx->time_base, ass_tb);
+        start_time = av_rescale_q(avpkt->pts, avctx->time_base, ass_tb);
         ret = ff_ass_add_rect_bprint(sub, &ctx->buffer, start_time, -1);
         if (ret < 0)
             return ret;



More information about the ffmpeg-cvslog mailing list