diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-05-28 11:57:37 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2016-05-28 11:57:37 +0200 |
| commit | a64a030ba0d13f9dc3a5d82b17053eda470b43b7 (patch) | |
| tree | 51fe7311df6bcaf1c0ae5255855a4d4f8939c564 /libavformat/mov.c | |
| parent | 86d703fd5584ea90530b23982faff17c8488a704 (diff) | |
| download | ffmpeg-a64a030ba0d13f9dc3a5d82b17053eda470b43b7.tar.gz | |
lavf/mov: Support one more Avid compression id for AVCI50.
Reported by forum user lexidata.
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e7d17f7282..57a03543cc 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1473,9 +1473,11 @@ static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (par->codec_tag == MKTAG('A', 'V', 'i', 'n') && par->codec_id == AV_CODEC_ID_H264 && atom.size > 11) { + int cid; avio_skip(pb, 10); + cid = avio_rb16(pb); /* For AVID AVCI50, force width of 1440 to be able to select the correct SPS and PPS */ - if (avio_rb16(pb) == 0xd4d) + if (cid == 0xd4d || cid == 0xd4e) par->width = 1440; return 0; } else if (par->codec_tag == MKTAG('A', 'V', 'd', '1') && |