Commit 1013c15f authored by Anshul Maheshwari's avatar Anshul Maheshwari Committed by Michael Niedermayer

changed name of erase_display_memory to screen_changed

Signed-off-by: 's avatarAnshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent d6d35425
...@@ -157,7 +157,7 @@ typedef struct CCaptionSubContext { ...@@ -157,7 +157,7 @@ typedef struct CCaptionSubContext {
uint8_t cursor_color; uint8_t cursor_color;
uint8_t cursor_font; uint8_t cursor_font;
AVBPrint buffer; AVBPrint buffer;
int erase_display_memory; int screen_changed;
int rollup; int rollup;
enum cc_mode mode; enum cc_mode mode;
int64_t start_time; int64_t start_time;
...@@ -355,7 +355,7 @@ static int handle_edm(CCaptionSubContext *ctx,int64_t pts) ...@@ -355,7 +355,7 @@ static int handle_edm(CCaptionSubContext *ctx,int64_t pts)
} }
ctx->startv_time = pts; ctx->startv_time = pts;
ctx->erase_display_memory = 1; ctx->screen_changed = 1;
ctx->end_time = pts; ctx->end_time = pts;
return ret; return ret;
} }
...@@ -495,7 +495,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp ...@@ -495,7 +495,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
continue; continue;
else else
process_cc608(ctx, avpkt->pts, *(bptr + i + 1) & 0x7f, *(bptr + i + 2) & 0x7f); process_cc608(ctx, avpkt->pts, *(bptr + i + 1) & 0x7f, *(bptr + i + 2) & 0x7f);
if(ctx->erase_display_memory && *ctx->buffer.str) if(ctx->screen_changed && *ctx->buffer.str)
{ {
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 });
...@@ -504,7 +504,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp ...@@ -504,7 +504,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
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);
ctx->erase_display_memory = 0; ctx->screen_changed = 0;
av_bprint_clear(&ctx->buffer); av_bprint_clear(&ctx->buffer);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment