virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avcodec/mpeg12dec: set FF_CODEC_PROPERTY_CLOSED_CAPTIONS in mpeg_set_cc_format()

Browse Source 
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>
This commit is contained in:
Marth64 2024-10-12 13:04:50 -05:00 committed by marth64
parent 2eb9c35010
commit 11c703be31
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg12dec.c
View File

@ -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); 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, static int mpeg_decode_a53_cc(AVCodecContext *avctx,
@ -1943,7 +1945,6 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx,
if (ret >= 0) if (ret >= 0)
memcpy(s1->a53_buf_ref->data + old_size, p + 7, cc_count * UINT64_C(3)); 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"); mpeg_set_cc_format(avctx, CC_FORMAT_A53_PART4, "A/53 Part 4");
} }
return 1; 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"); mpeg_set_cc_format(avctx, CC_FORMAT_SCTE20, "SCTE-20");
} }
return 1; 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"); mpeg_set_cc_format(avctx, CC_FORMAT_DVD, "DVD");
} }
return 1; return 1;