Skip to content

F
ffmpeg
Commit a64a030b authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

lavf/mov: Support one more Avid compression id for AVCI50. 

Reported by forum user lexidata.
parent 86d703fd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
libavformat/mov.c
View file @ a64a030b
......@@ -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') &&
......
libavformat/version.h
View file @ a64a030b
......@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 37
#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment