From 12cccabd0fedca3846f1381971aaffd30374bede Mon Sep 17 00:00:00 2001
From: Roman Shaposhnik <roman@shaposhnik.org>
Date: Tue, 18 May 2004 02:33:27 +0000
Subject: [PATCH] * IEC DV seems to accept SMPTE way of tagging 16:9 too.
Originally committed as revision 3139 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/dv.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/dv.c b/libavformat/dv.c
index 71033d2718d..48156741223 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -582,9 +582,11 @@ static int dv_extract_video_info(DVDemuxContext *c, uint8_t* frame)
avctx->height = sys->height;
avctx->pix_fmt = sys->pix_fmt;
+ /* finding out SAR is a little bit messy */
vsc_pack = dv_extract_pack(frame, dv_video_control);
apt = frame[4] & 0x07;
- is16_9 = (vsc_pack && (vsc_pack[2] & 0x07) == (apt?0x02:0x07));
+ is16_9 = (vsc_pack && ((vsc_pack[2] & 0x07) == 0x02 ||
+ (!apt && (vsc_pack[2] & 0x07) == 0x07)));
avctx->sample_aspect_ratio = sys->sar[is16_9];
size = sys->frame_size;
--
GitLab