virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/ccaption_dec: correcting line breaks in cc

Browse Source 
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anshul Maheshwari 2015-05-03 18:37:40 +05:30 committed by Michael Niedermayer
parent f9e802018e
commit a6b630e9b6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ccaption_dec.c
View File

@ -338,6 +338,10 @@ static int reap_screen(CCaptionSubContext *ctx, int64_t pts)
} }
} }
if(screen->row_used && ctx->buffer.len >= 2 ) {
ctx->buffer.len -= 2;
ctx->buffer.str[ctx->buffer.len] = 0;
}
ctx->startv_time = pts; ctx->startv_time = pts;
ctx->end_time = pts; ctx->end_time = pts;
return ret; return ret;
@ -550,7 +554,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
int start_time = av_rescale_q(ctx->start_time, avctx->time_base, (AVRational){ 1, 100 }); int start_time = av_rescale_q(ctx->start_time, avctx->time_base, (AVRational){ 1, 100 });
int end_time = av_rescale_q(ctx->end_time, avctx->time_base, (AVRational){ 1, 100 }); int end_time = av_rescale_q(ctx->end_time, avctx->time_base, (AVRational){ 1, 100 });
av_dlog(ctx, "cdp writing data (%s)\n",ctx->buffer.str); av_dlog(ctx, "cdp writing data (%s)\n",ctx->buffer.str);
ret = ff_ass_add_rect(sub, ctx->buffer.str, start_time, end_time - start_time , 0); ret = ff_ass_add_rect_bprint(sub, &ctx->buffer, start_time, end_time - start_time);
if (ret < 0) if (ret < 0)
return ret; return ret;
sub->pts = av_rescale_q(ctx->start_time, avctx->time_base, AV_TIME_BASE_Q); sub->pts = av_rescale_q(ctx->start_time, avctx->time_base, AV_TIME_BASE_Q);