Skip to content

Commit

Permalink
libavcodec/codec_desc.c: move AVCodecDescriptors to proper location
Browse files Browse the repository at this point in the history
I had assumed the DSMCC_B descriptor was in the proper location.
It is not, so neither are the others.  Put them in the correct order,
matching the order of the enum AVCodecID so the binary search finds
them correctly.
  • Loading branch information
ulmus-scott authored and bennettpeter committed Aug 15, 2022
1 parent b424fa1 commit 4f9e26d
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions mythtv/external/FFmpeg/libavcodec/codec_desc.c
Expand Up @@ -3400,6 +3400,24 @@ static const AVCodecDescriptor codec_descriptors[] = {
.props = AV_CODEC_PROP_TEXT_SUB,
.profiles = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles),
},
{
.id = AV_CODEC_ID_MPEG2VBI,
.type = AVMEDIA_TYPE_DATA,
.name = "mpeg2vbi",
.long_name = NULL_IF_CONFIG_SMALL("ivtv proprietary embedded VBI captions"),
},
{
.id = AV_CODEC_ID_DVB_VBI,
.type = AVMEDIA_TYPE_DATA,
.name = "dvb_vbi",
.long_name = NULL_IF_CONFIG_SMALL("dvb teletext"),
},
{
.id = AV_CODEC_ID_DSMCC_B,
.type = AVMEDIA_TYPE_DATA,
.name = "dsmcc_b",
.long_name = NULL_IF_CONFIG_SMALL("DSMCC B"),
},

/* other kind of codecs and pseudo-codecs */
{
Expand Down Expand Up @@ -3461,24 +3479,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
.name = "dvd_nav_packet",
.long_name = NULL_IF_CONFIG_SMALL("DVD Nav packet"),
},
{
.id = AV_CODEC_ID_MPEG2VBI,
.type = AVMEDIA_TYPE_DATA,
.name = "mpeg2vbi",
.long_name = NULL_IF_CONFIG_SMALL("ivtv proprietary embedded VBI captions"),
},
{
.id = AV_CODEC_ID_DVB_VBI,
.type = AVMEDIA_TYPE_DATA,
.name = "dvb_vbi",
.long_name = NULL_IF_CONFIG_SMALL("dvb teletext"),
},
{
.id = AV_CODEC_ID_DSMCC_B,
.type = AVMEDIA_TYPE_DATA,
.name = "dsmcc_b",
.long_name = NULL_IF_CONFIG_SMALL("DSMCC B"),
},
{
.id = AV_CODEC_ID_TIMED_ID3,
.type = AVMEDIA_TYPE_DATA,
Expand Down

0 comments on commit 4f9e26d

Please sign in to comment.