Browse Source

Set Matroska private data when muxing Prores.

The specification requires the mov code point to be written as "fourcc".
tags/n2.3
Carl Eugen Hoyos 11 years ago
parent
commit
3d5c859fa6
2 changed files with 5 additions and 0 deletions
  1. +2
    -0
      libavformat/matroskadec.c
  2. +3
    -0
      libavformat/matroskaenc.c

+ 2
- 0
libavformat/matroskadec.c View File

@@ -1914,6 +1914,8 @@ static int matroska_read_header(AVFormatContext *s)
st->codec->block_align = track->audio.sub_packet_size;
extradata_offset = 78;
}
} else if (codec_id == AV_CODEC_ID_PRORES && track->codec_priv.size == 4) {
fourcc = AV_RL32(track->codec_priv.data);
}
track->codec_priv.size -= extradata_offset;



+ 3
- 0
libavformat/matroskaenc.c View File

@@ -544,6 +544,9 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb, AVCodecCo
} else
avio_write(dyn_cp, codec->extradata + 12,
codec->extradata_size - 12);
} else if (codec->codec_id == AV_CODEC_ID_PRORES &&
ff_codec_get_id(ff_codec_movvideo_tags, codec->codec_tag) == AV_CODEC_ID_PRORES) {
avio_wl32(dyn_cp, codec->codec_tag);
}
else if (codec->extradata_size && codec->codec_id != AV_CODEC_ID_TTA)
avio_write(dyn_cp, codec->extradata, codec->extradata_size);


Loading…
Cancel
Save