X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=avi2swf%2Favi2swf.cc;h=be11eba0009825827c28b50fa615407bd3f27862;hb=cc13d1100afd10afff98bcbd85af571d94e95d86;hp=1de80a89c3deac36fdd91d8c36131d2ef7c17e17;hpb=aee9de2c6eb23628e54b6896f5b441d9b39317c1;p=swftools.git

diff --git a/avi2swf/avi2swf.cc b/avi2swf/avi2swf.cc
index 1de80a8..be11eba 100644
--- a/avi2swf/avi2swf.cc
+++ b/avi2swf/avi2swf.cc
@@ -71,6 +71,7 @@ static int flashversion = 6;
 static int keyframe_interval = -1;
 static int skip = 0;
 static float audio_adjust = 0;
+static int mp3_bitrate = 32;
 
 struct options_t options[] =
 {
@@ -78,6 +79,7 @@ struct options_t options[] =
  {"A","adjust"},
  {"o","output"},
  {"p","flip"},
+ {"m","mp3-bitrate"},
  {"q","quality"},
  {"s","scale"},
  {"S","skip"},
@@ -125,6 +127,10 @@ int args_callback_option(char*name,char*val)
 	expensive = 1;
 	return 0;
     }
+    else if(!strcmp(name, "m")) {
+	mp3_bitrate = atoi(val);
+	return 0;
+    }
     else if(!strcmp(name, "S")) {
 	skip = atoi(val);
 	return 1;
@@ -151,6 +157,7 @@ void args_callback_usage(char*name)
     printf("\t-o , --output filename\t Specify output filename\n"); 
     printf("\t-A , --adjust seconds\t Audio adjust: Shift sound -seconds to the future or +seconds into the past.\n"); 
     printf("\t-n , --num frames\t Number of frames to encode\n");
+    printf("\t-m , --mp3-bitrate <rate>\t Set the mp3 bitrate to encode audio with\n");
     printf("\t-d , --scale <val>\t Scale down to factor <val>. (in %, e.g. 100 = original size)\n");
     printf("\t-p , --flip\t\t Turn movie upside down\n");
     printf("\t-q , --quality <val>\t Set the quality to <val>. (0-100, 0=worst, 100=best, default:80)\n");
@@ -328,10 +335,12 @@ bool videoreader_avifile_eof(videoreader_t* v)
 void videoreader_avifile_close(videoreader_t* v)
 {
     videoreader_avifile_internal*i = (videoreader_avifile_internal*)v->internal;
-    ringbuffer_clear(&i->audio_buffer);
     if(verbose) {
 	printf("videoreader_close()\n");fflush(stdout);
     }
+    if(i->do_audio) {
+	ringbuffer_clear(&i->audio_buffer);
+    }
 }
 void* videoreader_avifile_getinfo(videoreader_t* v, char* name)
 {
@@ -507,7 +516,7 @@ int main (int argc,char ** argv)
     v2swf_setparameter(&v2swf, "quality", itoa(quality));
     v2swf_setparameter(&v2swf, "blockdiff", "0");
     v2swf_setparameter(&v2swf, "blockdiff_mode", "exact");
-    v2swf_setparameter(&v2swf, "mp3_bitrate", "32");
+    v2swf_setparameter(&v2swf, "mp3_bitrate", itoa(mp3_bitrate));
     //v2swf_setparameter(&v2swf, "fixheader", "1");
     //v2swf_setparameter(&v2swf, "framerate", "15");
     v2swf_setparameter(&v2swf, "scale", ftoa(scale));