[Ffmpeg-cvslog] r6635 - trunk/libavformat/amr.c

michael subversion
Wed Oct 11 01:53:14 CEST 2006


Author: michael
Date: Wed Oct 11 01:53:14 2006
New Revision: 6635

Modified:
   trunk/libavformat/amr.c

Log:
factorze another 2 lines


Modified: trunk/libavformat/amr.c
==============================================================================
--- trunk/libavformat/amr.c	(original)
+++ trunk/libavformat/amr.c	Wed Oct 11 01:53:14 2006
@@ -104,10 +104,8 @@
             return AVERROR_NOMEM;
         }
 
-        st->codec->codec_type = CODEC_TYPE_AUDIO;
         st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
         st->codec->codec_id = CODEC_ID_AMR_WB;
-        st->codec->channels = 1;
         st->codec->sample_rate = 16000;
     }
     else
@@ -118,12 +116,12 @@
             return AVERROR_NOMEM;
         }
 
-        st->codec->codec_type = CODEC_TYPE_AUDIO;
         st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
         st->codec->codec_id = CODEC_ID_AMR_NB;
-        st->codec->channels = 1;
         st->codec->sample_rate = 8000;
     }
+    st->codec->channels = 1;
+    st->codec->codec_type = CODEC_TYPE_AUDIO;
     av_set_pts_info(st, 64, 1, st->codec->sample_rate);
 
     return 0;




More information about the ffmpeg-cvslog mailing list