* IEC DV seems to accept SMPTE way of tagging 16:9 too.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3139 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/dv.c b/libavformat/dv.c
index 71033d2718d7e4b680bd619e2981dbdc0fcf5d58..4815674122363dcde10324ac9ea7a2bfe9fec823 100644 (file)
--- 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;