diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:57:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:57:42 +0200 |
| commit | 01a5d717891465bd126d2d3c318a022acd812bf5 (patch) | |
| tree | fad37db1400a5e14ab3a89ef1e3ebcb81d4bcf38 /libavformat/matroskadec.c | |
| parent | 9e7f1474dd5f3d33794b46e9a6555031c5165023 (diff) | |
| parent | 3d5c859fa6dcca9c6b37f90a5dac148c01ab4758 (diff) | |
| download | ffmpeg-01a5d717891465bd126d2d3c318a022acd812bf5.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Set Matroska private data when muxing Prores.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4390b6bb99..6976da8620 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -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; |