ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos@ag.or.at> | Thu Sep 29 15:29:03 2016 +0200| [fcce25ee5d2f3fbe4848dee4c3d11b195d2d8126] | committer: 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.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcce25ee5d2f3fbe48...

libavformat/mov.c | 3 ++- libavformat/version.h | 2 +- tests/ref/fate/dnxhd-mbaff | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8b7bbf1..a15c8d1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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); diff --git a/libavformat/version.h b/libavformat/version.h index b0b5593..848403e 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -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, \ diff --git a/tests/ref/fate/dnxhd-mbaff b/tests/ref/fate/dnxhd-mbaff index d694cfe..8e95227 100644 --- a/tests/ref/fate/dnxhd-mbaff +++ b/tests/ref/fate/dnxhd-mbaff @@ -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