Commit fcce25ee authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

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

Fixes aspect ratio of sample in ticket #2125.
Fixes aspect ratio of sample in ticket #5325.
parent 29a76ff5
......@@ -1487,7 +1487,8 @@ static int mov_read_ares(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (cid == 0xd4d || cid == 0xd4e)
par->width = 1440;
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) {
int num, den;
avio_skip(pb, 12);
......
......@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#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, \
LIBAVFORMAT_VERSION_MINOR, \
......
......@@ -2,5 +2,5 @@
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 1440x1080
#sar 0: 4/3
#sar 0: 1/1
0, 0, 0, 1, 6220800, 0xe78198c0
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