diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 18:38:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 00:02:48 +0200 |
| commit | d41dceb14e0697a53c2ba59d01e3180b0ea724f7 (patch) | |
| tree | bfbb9fe85579cd705623c83cb4bad3f2d579dddb /libavcodec/dvbsubdec.c | |
| parent | dcc540db6ee0f41edd09b40d9854fb1a6509eab3 (diff) | |
| download | ffmpeg-d41dceb14e0697a53c2ba59d01e3180b0ea724f7.tar.gz | |
avcodec/dvbsubdec: Add option to select when to computer clut (always/never/"if needed")
Reviewed-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dvbsubdec.c')
| -rw-r--r-- | libavcodec/dvbsubdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 9f59b7259f..e3b72ab1ff 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -237,6 +237,7 @@ typedef struct DVBSubContext { int time_out; int compute_edt; /**< if 1 end display time calculated using pts if 0 (Default) calculated using time out */ + int compute_clut; int64_t prev_start; DVBSubRegion *region_list; DVBSubCLUT *clut_list; @@ -912,7 +913,7 @@ static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_ou memcpy(rect->pict.data[0], region->pbuf, region->buf_size); - if (clut == &default_clut) + if ((clut == &default_clut && ctx->compute_clut == -1) || ctx->compute_clut == 1) compute_default_clut(&rect->pict, rect->w, rect->h); i++; @@ -1706,6 +1707,7 @@ end: #define DS AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_SUBTITLE_PARAM static const AVOption options[] = { {"compute_edt", "compute end of time using pts or timeout", offsetof(DVBSubContext, compute_edt), FF_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DS}, + {"compute_clut", "compute clut when not available(-1) or always(1) or never(0)", offsetof(DVBSubContext, compute_clut), FF_OPT_TYPE_INT, {.i64 = -1}, -1, 1, DS}, {NULL} }; static const AVClass dvbsubdec_class = { |