[MPlayer-users] Re: [BUG] movie-aspect autodetection failes formkv in r22325

[lists at eastcheap.org]

On Mon, 5 Mar 2007, lists at eastcheap.org wrote:

> On Mon, 5 Mar 2007, Carl Eugen Hoyos wrote:
>
>> Could you test attached patch (or point me to a sample)? Your patch breaks 
>> MPEG (DVB) aspect change.

> I'm working on it.  If it's possible (and that's a big "if"), I might 
> have a working ad hoc patch by tomorrow.

Didn't take as long as I thought it would.  Why don't you give this one 
(for AVI) a try and let me know how things work out.  If it looks good 
I'll try to work out an mkv patch and post them to mplayer-dev-eng or 
something.
-------------- next part --------------
Index: libmpdemux/aviheader.c
===================================================================
--- libmpdemux/aviheader.c	(revision 22472)
+++ libmpdemux/aviheader.c	(working copy)
@@ -15,6 +15,8 @@
 #include "aviheader.h"
 #include "libavutil/common.h"
 
+extern float movie_aspect;
+
 static MainAVIHeader avih;
 
 extern void print_avih(MainAVIHeader *h, int verbose_level);
@@ -344,9 +346,12 @@
 	for (i=0; i<vprp->nbFieldPerFrame; i++) {
 		le2me_VIDEO_FIELD_DESC(&vprp->FieldInfo[i]);
 	}
-	if (sh_video) {
-		sh_video->aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio);
+	if (movie_aspect < 0.0) {
+	    movie_aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio);
 	}
+//	if (sh_video) {
+//		sh_video->aspect = GET_AVI_ASPECT(vprp->dwFrameAspectRatio);
+//	}
 	if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_vprp(vprp,MSGL_V);
 	free(vprp);
 	break;