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

Originally committed as revision 3139 to svn://svn.ffmpeg.org/ffmpeg/trunk
21 years ago · 12cccabd0f
parent a8eb52a8c3
commit 12cccabd0f
1 changed files with 3 additions and 1 deletions
--- 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;