diff options
| author | Aman Gupta <aman@tmm1.net> | 2016-01-05 21:41:03 -0800 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-01-09 11:53:52 +0100 |
| commit | 6049b15c0afce3e4c359f9ca194c04980064b0dd (patch) | |
| tree | ebc817268a92613ca5e0a0be431e9f2d951c9916 /libavcodec | |
| parent | 2693275c02f8d1b989505ce1d87b767b5e67ba18 (diff) | |
lavc/ccaption_dec: combine ROLLUP modes as they are identical
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ccaption_dec.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index cd431cc054..58bea47c98 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -37,9 +37,7 @@ enum cc_mode { CCMODE_POPON, CCMODE_PAINTON, - CCMODE_ROLLUP_2, - CCMODE_ROLLUP_3, - CCMODE_ROLLUP_4, + CCMODE_ROLLUP, CCMODE_TEXT, }; @@ -143,7 +141,7 @@ static av_cold int init_decoder(AVCodecContext *avctx) av_bprint_init(&ctx->buffer, 0, AV_BPRINT_SIZE_UNLIMITED); /* taking by default roll up to 2 */ - ctx->mode = CCMODE_ROLLUP_2; + ctx->mode = CCMODE_ROLLUP; ctx->rollup = 2; ret = ff_ass_subtitle_header_default(avctx); if (ret < 0) { @@ -233,9 +231,7 @@ static struct Screen *get_writing_screen(CCaptionSubContext *ctx) // use Inactive screen return ctx->screen + !ctx->active_screen; case CCMODE_PAINTON: - case CCMODE_ROLLUP_2: - case CCMODE_ROLLUP_3: - case CCMODE_ROLLUP_4: + case CCMODE_ROLLUP: case CCMODE_TEXT: // use active screen return ctx->screen + ctx->active_screen; @@ -433,15 +429,15 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint break; case 0x25: ctx->rollup = 2; - ctx->mode = CCMODE_ROLLUP_2; + ctx->mode = CCMODE_ROLLUP; break; case 0x26: ctx->rollup = 3; - ctx->mode = CCMODE_ROLLUP_3; + ctx->mode = CCMODE_ROLLUP; break; case 0x27: ctx->rollup = 4; - ctx->mode = CCMODE_ROLLUP_4; + ctx->mode = CCMODE_ROLLUP; break; case 0x29: /* resume direct captioning */ |