avformat/matroska: Move mime_tag lists to matroskadec
They are not used any more by the muxer. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
3589b3f2e2
commit
67e957b43a
|
@ -119,25 +119,6 @@ const CodecTags ff_webm_codec_tags[] = {
|
||||||
{"" , AV_CODEC_ID_NONE}
|
{"" , AV_CODEC_ID_NONE}
|
||||||
};
|
};
|
||||||
|
|
||||||
const CodecMime ff_mkv_image_mime_tags[] = {
|
|
||||||
{"image/gif" , AV_CODEC_ID_GIF},
|
|
||||||
{"image/jpeg" , AV_CODEC_ID_MJPEG},
|
|
||||||
{"image/png" , AV_CODEC_ID_PNG},
|
|
||||||
{"image/tiff" , AV_CODEC_ID_TIFF},
|
|
||||||
|
|
||||||
{"" , AV_CODEC_ID_NONE}
|
|
||||||
};
|
|
||||||
|
|
||||||
const CodecMime ff_mkv_mime_tags[] = {
|
|
||||||
{"text/plain" , AV_CODEC_ID_TEXT},
|
|
||||||
{"application/x-truetype-font", AV_CODEC_ID_TTF},
|
|
||||||
{"application/x-font" , AV_CODEC_ID_TTF},
|
|
||||||
{"application/vnd.ms-opentype", AV_CODEC_ID_OTF},
|
|
||||||
{"binary" , AV_CODEC_ID_BIN_DATA},
|
|
||||||
|
|
||||||
{"" , AV_CODEC_ID_NONE}
|
|
||||||
};
|
|
||||||
|
|
||||||
const AVMetadataConv ff_mkv_metadata_conv[] = {
|
const AVMetadataConv ff_mkv_metadata_conv[] = {
|
||||||
{ "LEAD_PERFORMER", "performer" },
|
{ "LEAD_PERFORMER", "performer" },
|
||||||
{ "PART_NUMBER" , "track" },
|
{ "PART_NUMBER" , "track" },
|
||||||
|
|
|
@ -362,8 +362,6 @@ typedef struct CodecTags{
|
||||||
|
|
||||||
extern const CodecTags ff_mkv_codec_tags[];
|
extern const CodecTags ff_mkv_codec_tags[];
|
||||||
extern const CodecTags ff_webm_codec_tags[];
|
extern const CodecTags ff_webm_codec_tags[];
|
||||||
extern const CodecMime ff_mkv_mime_tags[];
|
|
||||||
extern const CodecMime ff_mkv_image_mime_tags[];
|
|
||||||
extern const AVMetadataConv ff_mkv_metadata_conv[];
|
extern const AVMetadataConv ff_mkv_metadata_conv[];
|
||||||
extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB];
|
extern const char * const ff_matroska_video_stereo_mode[MATROSKA_VIDEO_STEREOMODE_TYPE_NB];
|
||||||
extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];
|
extern const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];
|
||||||
|
|
|
@ -747,6 +747,25 @@ static EbmlSyntax matroska_cluster_enter[] = {
|
||||||
};
|
};
|
||||||
#undef CHILD_OF
|
#undef CHILD_OF
|
||||||
|
|
||||||
|
static const CodecMime mkv_image_mime_tags[] = {
|
||||||
|
{"image/gif" , AV_CODEC_ID_GIF},
|
||||||
|
{"image/jpeg" , AV_CODEC_ID_MJPEG},
|
||||||
|
{"image/png" , AV_CODEC_ID_PNG},
|
||||||
|
{"image/tiff" , AV_CODEC_ID_TIFF},
|
||||||
|
|
||||||
|
{"" , AV_CODEC_ID_NONE}
|
||||||
|
};
|
||||||
|
|
||||||
|
static const CodecMime mkv_mime_tags[] = {
|
||||||
|
{"text/plain" , AV_CODEC_ID_TEXT},
|
||||||
|
{"application/x-truetype-font", AV_CODEC_ID_TTF},
|
||||||
|
{"application/x-font" , AV_CODEC_ID_TTF},
|
||||||
|
{"application/vnd.ms-opentype", AV_CODEC_ID_OTF},
|
||||||
|
{"binary" , AV_CODEC_ID_BIN_DATA},
|
||||||
|
|
||||||
|
{"" , AV_CODEC_ID_NONE}
|
||||||
|
};
|
||||||
|
|
||||||
static const char *const matroska_doctypes[] = { "matroska", "webm" };
|
static const char *const matroska_doctypes[] = { "matroska", "webm" };
|
||||||
|
|
||||||
static int matroska_read_close(AVFormatContext *s);
|
static int matroska_read_close(AVFormatContext *s);
|
||||||
|
@ -2882,10 +2901,10 @@ static int matroska_read_header(AVFormatContext *s)
|
||||||
av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0);
|
av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0);
|
||||||
st->codecpar->codec_id = AV_CODEC_ID_NONE;
|
st->codecpar->codec_id = AV_CODEC_ID_NONE;
|
||||||
|
|
||||||
for (i = 0; ff_mkv_image_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
|
for (i = 0; mkv_image_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
|
||||||
if (!strncmp(ff_mkv_image_mime_tags[i].str, attachments[j].mime,
|
if (!strncmp(mkv_image_mime_tags[i].str, attachments[j].mime,
|
||||||
strlen(ff_mkv_image_mime_tags[i].str))) {
|
strlen(mkv_image_mime_tags[i].str))) {
|
||||||
st->codecpar->codec_id = ff_mkv_image_mime_tags[i].id;
|
st->codecpar->codec_id = mkv_image_mime_tags[i].id;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2913,10 +2932,10 @@ static int matroska_read_header(AVFormatContext *s)
|
||||||
memcpy(st->codecpar->extradata, attachments[j].bin.data,
|
memcpy(st->codecpar->extradata, attachments[j].bin.data,
|
||||||
attachments[j].bin.size);
|
attachments[j].bin.size);
|
||||||
|
|
||||||
for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
|
for (i = 0; mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
|
||||||
if (!strncmp(ff_mkv_mime_tags[i].str, attachments[j].mime,
|
if (!strncmp(mkv_mime_tags[i].str, attachments[j].mime,
|
||||||
strlen(ff_mkv_mime_tags[i].str))) {
|
strlen(mkv_mime_tags[i].str))) {
|
||||||
st->codecpar->codec_id = ff_mkv_mime_tags[i].id;
|
st->codecpar->codec_id = mkv_mime_tags[i].id;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue