Mercurial > mplayer.hg

changeset 37102:0bbd04a5f920

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mencoder: simplify audio copy case.
author reimar
date Sat, 10 May 2014 20:23:21 +0000
parents ab6b3fd992dc
children bc3d67969fcc
files mencoder.c
diffstat 1 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Sat May 10 20:23:20 2014 +0000
+++ b/mencoder.c	Sat May 10 20:23:21 2014 +0000
@@ -1373,24 +1373,16 @@
 	    }
 	    if (v_muxer_time == 0) mux_a->h.dwInitialFrames++;
 	}
-	else {
+	else if (mux_a->codec == ACODEC_COPY) {
 	if(mux_a->h.dwSampleSize){
 	    int len;
-	    switch(mux_a->codec){
-	    case ACODEC_COPY: // copy
 		len=mux_a->wf->nAvgBytesPerSec*tottime;
 		len/=mux_a->h.dwSampleSize;if(len<1) len=1;
 		len*=mux_a->h.dwSampleSize;
 		bytes_to_mux=demux_read_data(sh_audio->ds,mux_a->buffer,len);
-		break;
-	    }
 	} else {
 	    // VBR - encode/copy an audio frame
-	    switch(mux_a->codec){
-	    case ACODEC_COPY: // copy
 		bytes_to_mux=ds_get_packet(sh_audio->ds,(unsigned char**) &mux_a->buffer);
-		break;
-		}
 	    }
 	}
 	if(bytes_to_mux<=0) {