diff options
| author | Marth64 <marth64@proxyid.net> | 2024-10-12 13:04:50 -0500 |
|---|---|---|
| committer | marth64 <marth64@ff-prod-001.local> | 2024-11-07 21:27:04 -0600 |
| commit | 11c703be3176174c2ddb0f3893d10f3ed1accb89 (patch) | |
| tree | 4148aeea7a434d682cc55bf1156ee41abf279672 | |
| parent | 2eb9c35010fe2c65a6d0f9a420332bca369c5ead (diff) | |
| download | ffmpeg-11c703be3176174c2ddb0f3893d10f3ed1accb89.tar.gz | |
avcodec/mpeg12dec: set FF_CODEC_PROPERTY_CLOSED_CAPTIONS in mpeg_set_cc_format()
When Closed Captions are discovered, this method is always invoked.
Therefore, use it to set the property instead of repeating the statement.
Signed-off-by: Marth64 <marth64@proxyid.net>
| -rw-r--r-- | libavcodec/mpeg12dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 4f784611de..c0ed6a9d5b 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1917,6 +1917,8 @@ static void mpeg_set_cc_format(AVCodecContext *avctx, enum Mpeg2ClosedCaptionsFo av_log(avctx, AV_LOG_DEBUG, "CC: first seen substream is %s format\n", label); } + + avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } static int mpeg_decode_a53_cc(AVCodecContext *avctx, @@ -1943,7 +1945,6 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, if (ret >= 0) memcpy(s1->a53_buf_ref->data + old_size, p + 7, cc_count * UINT64_C(3)); - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; mpeg_set_cc_format(avctx, CC_FORMAT_A53_PART4, "A/53 Part 4"); } return 1; @@ -1993,7 +1994,6 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, } } - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; mpeg_set_cc_format(avctx, CC_FORMAT_SCTE20, "SCTE-20"); } return 1; @@ -2056,7 +2056,6 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, } } - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; mpeg_set_cc_format(avctx, CC_FORMAT_DVD, "DVD"); } return 1; |