[Ffmpeg-cvslog] CVS: ffmpeg/libavformat movenc.c,1.69,1.70

[Baptiste Coudurier CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv8943/libavformat

Modified Files:
	movenc.c 
Log Message:
simplify, amr.c sets frame_size to 160, and sample size is always 8000

Index: movenc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/movenc.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- movenc.c	10 May 2006 17:56:39 -0000	1.69
+++ movenc.c	10 May 2006 18:00:16 -0000	1.70
@@ -1425,17 +1425,9 @@
         if(mov->tracks[i].enc->codec_type == CODEC_TYPE_VIDEO) {
             mov->tracks[i].timescale = mov->tracks[i].enc->time_base.den;
             mov->tracks[i].sampleDuration = mov->tracks[i].enc->time_base.num;
-        }
-        else if(mov->tracks[i].enc->codec_type == CODEC_TYPE_AUDIO) {
-            /* If AMR, track timescale = 8000, AMR_WB = 16000 */
-            if(mov->tracks[i].enc->codec_id == CODEC_ID_AMR_NB) {
-                mov->tracks[i].sampleDuration = 160;  // Bytes per chunk
-                mov->tracks[i].timescale = 8000;
-            }
-            else {
-                mov->tracks[i].timescale = mov->tracks[i].enc->sample_rate;
-                mov->tracks[i].sampleDuration = mov->tracks[i].enc->frame_size;
-            }
+        } else if(mov->tracks[i].enc->codec_type == CODEC_TYPE_AUDIO) {
+            mov->tracks[i].timescale = mov->tracks[i].enc->sample_rate;
+            mov->tracks[i].sampleDuration = mov->tracks[i].enc->frame_size;
         }
 
         mov->tracks[i].trackDuration =