har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf/mov: Read display aspect ratio from ares atom also for dnxhd.

Browse Source 
Fixes aspect ratio of sample in ticket #2125.
Fixes aspect ratio of sample in ticket #5325.
This commit is contained in:
Carl Eugen Hoyos 2016-09-29 15:29:03 +02:00
parent 29a76ff525
commit fcce25ee5d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mov.c
View File

@ -1487,7 +1487,8 @@ static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (cid == 0xd4d || cid == 0xd4e) if (cid == 0xd4d || cid == 0xd4e)
par->width = 1440; par->width = 1440;
return 0; return 0;
} else if (par->codec_tag == MKTAG('A', 'V', 'd', '1') && } else if ((par->codec_tag == MKTAG('A', 'V', 'd', '1') ||
par->codec_tag == MKTAG('A', 'V', 'd', 'n')) &&
atom.size >= 24) { atom.size >= 24) {
int num, den; int num, den;
avio_skip(pb, 12); avio_skip(pb, 12);

2
libavformat/version.h
View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 51 #define LIBAVFORMAT_VERSION_MINOR 51
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \

2
tests/ref/fate/dnxhd-mbaff
View File

@ -2,5 +2,5 @@
#media_type 0: video #media_type 0: video
#codec_id 0: rawvideo #codec_id 0: rawvideo
#dimensions 0: 1440x1080 #dimensions 0: 1440x1080
#sar 0: 4/3 #sar 0: 1/1
0, 0, 0, 1, 6220800, 0xe78198c0 0, 0, 0, 1, 6220800, 0xe78198c0