# HG changeset patch # User michael # Date 1167424819 0 # Node ID 03bc990498fcb678f2bd08037ae8a411a38d5de1 # Parent 8bc0464ab286b51b20effaf3de1592bb8baac91e 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) diff -r 8bc0464ab286 -r 03bc990498fc libmpcodecs/ae_lavc.c --- a/libmpcodecs/ae_lavc.c Fri Dec 29 19:01:55 2006 +0000 +++ b/libmpcodecs/ae_lavc.c Fri Dec 29 20:40:19 2006 +0000 @@ -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;