Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 23:13:20 +0000 (00:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 23:13:20 +0000 (00:13 +0100)
* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/matroskadec.c

@@@ -2047,17 -1795,19 +2047,17 @@@ static int matroska_read_header(AVForma
              AVStream *st = avformat_new_stream(s, NULL);
              if (st == NULL)
                  break;
-             av_dict_set(&st->metadata, "filename", attachements[j].filename, 0);
-             av_dict_set(&st->metadata, "mimetype", attachements[j].mime, 0);
+             av_dict_set(&st->metadata, "filename", attachments[j].filename, 0);
+             av_dict_set(&st->metadata, "mimetype", attachments[j].mime, 0);
              st->codec->codec_id   = AV_CODEC_ID_NONE;
              st->codec->codec_type = AVMEDIA_TYPE_ATTACHMENT;
-             if (ff_alloc_extradata(st->codec, attachements[j].bin.size))
 -            st->codec->extradata  = av_malloc(attachments[j].bin.size);
 -            if (st->codec->extradata == NULL)
++            if (ff_alloc_extradata(st->codec, attachments[j].bin.size))
                  break;
-             memcpy(st->codec->extradata, attachements[j].bin.data,
-                    attachements[j].bin.size);
 -            st->codec->extradata_size = attachments[j].bin.size;
+             memcpy(st->codec->extradata, attachments[j].bin.data,
+                    attachments[j].bin.size);
  
              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))) {
                      st->codec->codec_id = ff_mkv_mime_tags[i].id;
                      break;