highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Browse Source
This commit is contained in:
Diego Biurrun
2014-03-07 13:54:18 +01:00
parent 84cfce9f99
commit f69befe5ee
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libavformat/matroskadec.c
View File

@@ -166,7 +166,7 @@ typedef struct {
EbmlBin bin; EbmlBin bin;
AVStream *stream; AVStream *stream;
} MatroskaAttachement; } MatroskaAttachment;
typedef struct { typedef struct {
uint64_t start; uint64_t start;
@@ -379,16 +379,16 @@ static EbmlSyntax matroska_tracks[] = {
}; };
static EbmlSyntax matroska_attachment[] = { static EbmlSyntax matroska_attachment[] = {
{ MATROSKA_ID_FILEUID, EBML_UINT, 0, offsetof(MatroskaAttachement, uid) }, { MATROSKA_ID_FILEUID, EBML_UINT, 0, offsetof(MatroskaAttachment, uid) },
{ MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement, filename) }, { MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachment, filename) },
{ MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement, mime) }, { MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachment, mime) },
{ MATROSKA_ID_FILEDATA, EBML_BIN, 0, offsetof(MatroskaAttachement, bin) }, { MATROSKA_ID_FILEDATA, EBML_BIN, 0, offsetof(MatroskaAttachment, bin) },
{ MATROSKA_ID_FILEDESC, EBML_NONE }, { MATROSKA_ID_FILEDESC, EBML_NONE },
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_attachments[] = { static EbmlSyntax matroska_attachments[] = {
{ MATROSKA_ID_ATTACHEDFILE, EBML_NEST, sizeof(MatroskaAttachement), offsetof(MatroskaDemuxContext, attachments), { .n = matroska_attachment } }, { MATROSKA_ID_ATTACHEDFILE, EBML_NEST, sizeof(MatroskaAttachment), offsetof(MatroskaDemuxContext, attachments), { .n = matroska_attachment } },
{ 0 } { 0 }
}; };
@@ -1270,7 +1270,7 @@ static void matroska_convert_tags(AVFormatContext *s)
for (i = 0; i < matroska->tags.nb_elem; i++) { for (i = 0; i < matroska->tags.nb_elem; i++) {
if (tags[i].target.attachuid) { if (tags[i].target.attachuid) {
MatroskaAttachement *attachment = matroska->attachments.elem; MatroskaAttachment *attachment = matroska->attachments.elem;
for (j = 0; j < matroska->attachments.nb_elem; j++) for (j = 0; j < matroska->attachments.nb_elem; j++)
if (attachment[j].uid == tags[i].target.attachuid && if (attachment[j].uid == tags[i].target.attachuid &&
attachment[j].stream) attachment[j].stream)
@@ -1437,9 +1437,9 @@ static int matroska_aac_sri(int samplerate)
static int matroska_read_header(AVFormatContext *s) static int matroska_read_header(AVFormatContext *s)
{ {
MatroskaDemuxContext *matroska = s->priv_data; MatroskaDemuxContext *matroska = s->priv_data;
EbmlList *attachements_list = &matroska->attachments; EbmlList *attachments_list = &matroska->attachments;
EbmlList *chapters_list = &matroska->chapters; EbmlList *chapters_list = &matroska->chapters;
MatroskaAttachement *attachements; MatroskaAttachment *attachments;
MatroskaChapter *chapters; MatroskaChapter *chapters;
MatroskaTrack *tracks; MatroskaTrack *tracks;
uint64_t max_start = 0; uint64_t max_start = 0;
@@ -1786,34 +1786,34 @@ static int matroska_read_header(AVFormatContext *s)
} }
} }
attachements = attachements_list->elem; attachments = attachments_list->elem;
for (j = 0; j < attachements_list->nb_elem; j++) { for (j = 0; j < attachments_list->nb_elem; j++) {
if (!(attachements[j].filename && attachements[j].mime && if (!(attachments[j].filename && attachments[j].mime &&
attachements[j].bin.data && attachements[j].bin.size > 0)) { attachments[j].bin.data && attachments[j].bin.size > 0)) {
av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n"); av_log(matroska->ctx, AV_LOG_ERROR, "incomplete attachment\n");
} else { } else {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
if (st == NULL) if (st == NULL)
break; break;
av_dict_set(&st->metadata, "filename", attachements[j].filename, 0); av_dict_set(&st->metadata, "filename", attachments[j].filename, 0);
av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0); av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0);
st->codec->codec_id = AV_CODEC_ID_NONE; st->codec->codec_id = AV_CODEC_ID_NONE;
st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT; st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
st->codec->extradata = av_malloc(attachements[j].bin.size); st->codec->extradata = av_malloc(attachments[j].bin.size);
if (st->codec->extradata == NULL) if (st->codec->extradata == NULL)
break; break;
st->codec->extradata_size = attachements[j].bin.size; st->codec->extradata_size = attachments[j].bin.size;
memcpy(st->codec->extradata, attachements[j].bin.data, memcpy(st->codec->extradata, attachments[j].bin.data,
attachements[j].bin.size); attachments[j].bin.size);
for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) { for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) {
if (!strncmp(ff_mkv_mime_tags[i].str, attachements[j].mime, if (!strncmp(ff_mkv_mime_tags[i].str, attachments[j].mime,
strlen(ff_mkv_mime_tags[i].str))) { strlen(ff_mkv_mime_tags[i].str))) {
st->codec->codec_id = ff_mkv_mime_tags[i].id; st->codec->codec_id = ff_mkv_mime_tags[i].id;
break; break;
} }
} }
attachements[j].stream = st; attachments[j].stream = st;
} }
} }