virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

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

Browse Source 
Reported by forum user lexidata.
This commit is contained in:
Carl Eugen Hoyos 2016-05-28 11:57:37 +02:00
parent 86d703fd55
commit a64a030ba0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mov.c
View File

@ -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') &&

2
libavformat/version.h
View File

@ -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, \