[FFmpeg-cvslog] changed name of erase_display_memory to screen_changed
Anshul Maheshwari
git at videolan.org
Tue Jan 20 15:07:06 CET 2015
ffmpeg | branch: master | Anshul Maheshwari <er.anshul.maheshwari at gmail.com> | Tue Jan 20 16:28:36 2015 +0530| [1013c15f72f9b55252374bf2d0aa297b7b4e885c] | committer: Michael Niedermayer
changed name of erase_display_memory to screen_changed
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1013c15f72f9b55252374bf2d0aa297b7b4e885c
---
libavcodec/ccaption_dec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
index 686cba3..1666797 100644
--- a/libavcodec/ccaption_dec.c
+++ b/libavcodec/ccaption_dec.c
@@ -157,7 +157,7 @@ typedef struct CCaptionSubContext {
uint8_t cursor_color;
uint8_t cursor_font;
AVBPrint buffer;
- int erase_display_memory;
+ int screen_changed;
int rollup;
enum cc_mode mode;
int64_t start_time;
@@ -355,7 +355,7 @@ static int handle_edm(CCaptionSubContext *ctx,int64_t pts)
}
ctx->startv_time = pts;
- ctx->erase_display_memory = 1;
+ ctx->screen_changed = 1;
ctx->end_time = pts;
return ret;
}
@@ -495,7 +495,7 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
continue;
else
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 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
if (ret < 0)
return ret;
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);
}
}
More information about the ffmpeg-cvslog
mailing list