[MPlayer-cvslog] r21789 - trunk/libmpcodecs/ae_lavc.c

[michael]

Author: michael
Date: Fri Dec 29 21:40:19 2006
New Revision: 21789

Modified:
   trunk/libmpcodecs/ae_lavc.c

Log:
the avi spec does not allow random samplesize whoever wrote this should be shot
also block align should be equal to sample size
i dunno if this breaks anything but the old code was definitly not correct
this also fixes amr_nb muxing (in .3gp with lavf for example)


Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c	(original)
+++ trunk/libmpcodecs/ae_lavc.c	Fri Dec 29 21:40:19 2006
@@ -56,9 +56,12 @@
 			mux_a->h.dwSampleSize = 0; // Blocksize not constant
 		} 
 		else 
-			mux_a->h.dwSampleSize = mux_a->h.dwScale;
+			mux_a->h.dwSampleSize = 0;
 	}
-	mux_a->wf->nBlockAlign = mux_a->h.dwScale;
+        if(mux_a->h.dwSampleSize)
+                mux_a->wf->nBlockAlign = mux_a->h.dwSampleSize;
+        else
+                mux_a->wf->nBlockAlign = 1;
 	mux_a->h.dwSuggestedBufferSize = (encoder->params.audio_preload*mux_a->wf->nAvgBytesPerSec)/1000;
 	mux_a->h.dwSuggestedBufferSize -= mux_a->h.dwSuggestedBufferSize % mux_a->wf->nBlockAlign;