[Ffmpeg-devel] [PATCH] remove static default initialization

Limin Wang lance.lmwang
Sun Apr 1 04:35:23 CEST 2007


Hi,

$subj, please review it, have pass "make test"


Thanks,
Limin
-------------- next part --------------
Index: ffmpeg.c
===================================================================
--- ffmpeg.c	(revision 8565)
+++ ffmpeg.c	(working copy)
@@ -81,10 +81,10 @@
 
 static AVFormatContext *input_files[MAX_FILES];
 static int64_t input_files_ts_offset[MAX_FILES];
-static int nb_input_files = 0;
+static int nb_input_files;
 
 static AVFormatContext *output_files[MAX_FILES];
-static int nb_output_files = 0;
+static int nb_output_files;
 
 static AVStreamMap stream_maps[MAX_FILES];
 static int nb_stream_maps;
@@ -94,123 +94,123 @@
 
 static AVInputFormat *file_iformat;
 static AVOutputFormat *file_oformat;
-static int frame_width  = 0;
-static int frame_height = 0;
-static float frame_aspect_ratio = 0;
+static int frame_width;
+static int frame_height;
+static float frame_aspect_ratio;
 static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE;
-static int frame_padtop  = 0;
-static int frame_padbottom = 0;
-static int frame_padleft  = 0;
-static int frame_padright = 0;
+static int frame_padtop;
+static int frame_padbottom;
+static int frame_padleft;
+static int frame_padright;
 static int padcolor[3] = {16,128,128}; /* default to black */
-static int frame_topBand  = 0;
-static int frame_bottomBand = 0;
-static int frame_leftBand  = 0;
-static int frame_rightBand = 0;
+static int frame_topBand;
+static int frame_bottomBand;
+static int frame_leftBand;
+static int frame_rightBand;
 static int max_frames[4] = {INT_MAX, INT_MAX, INT_MAX, INT_MAX};
 static int frame_rate = 25;
 static int frame_rate_base = 1;
-static float video_qscale = 0;
+static float video_qscale;
 static int video_qdiff = 3;
-static uint16_t *intra_matrix = NULL;
-static uint16_t *inter_matrix = NULL;
+static uint16_t *intra_matrix;
+static uint16_t *inter_matrix;
 #if 0 //experimental, (can be removed)
 static float video_rc_qsquish=1.0;
 static float video_rc_qmod_amp=0;
 static int video_rc_qmod_freq=0;
 #endif
-static char *video_rc_override_string=NULL;
+static char *video_rc_override_string;
 static char *video_rc_eq="tex^qComp";
 static int me_method = ME_EPZS;
-static int video_disable = 0;
-static int video_discard = 0;
+static int video_disable;
+static int video_discard;
 static int video_codec_id = CODEC_ID_NONE;
-static int video_codec_tag = 0;
-static int same_quality = 0;
-static int do_deinterlace = 0;
-static int strict = 0;
+static int video_codec_tag;
+static int same_quality;
+static int do_deinterlace;
+static int strict;
 static int top_field_first = -1;
-static int me_threshold = 0;
+static int me_threshold;
 static int intra_dc_precision = 8;
-static int loop_input = 0;
+static int loop_input;
 static int loop_output = AVFMT_NOOUTPUTLOOP;
-static int qp_hist = 0;
+static int qp_hist;
 
-static int intra_only = 0;
+static int intra_only;
 static int audio_sample_rate = 44100;
 #define QSCALE_NONE -99999
 static float audio_qscale = QSCALE_NONE;
-static int audio_disable = 0;
+static int audio_disable;
 static int audio_channels = 1;
 static int audio_codec_id = CODEC_ID_NONE;
-static int audio_codec_tag = 0;
-static char *audio_language = NULL;
+static int audio_codec_tag;
+static char *audio_language;
 
 static int subtitle_codec_id = CODEC_ID_NONE;
-static char *subtitle_language = NULL;
+static char *subtitle_language;
 
 static float mux_preload= 0.5;
 static float mux_max_delay= 0.7;
 
-static int64_t recording_time = 0;
-static int64_t start_time = 0;
-static int64_t rec_timestamp = 0;
-static int64_t input_ts_offset = 0;
-static int file_overwrite = 0;
-static char *str_title = NULL;
-static char *str_author = NULL;
-static char *str_copyright = NULL;
-static char *str_comment = NULL;
-static char *str_album = NULL;
-static int do_benchmark = 0;
-static int do_hex_dump = 0;
-static int do_pkt_dump = 0;
-static int do_psnr = 0;
-static int do_vstats = 0;
-static int do_pass = 0;
-static char *pass_logfilename = NULL;
-static int audio_stream_copy = 0;
-static int video_stream_copy = 0;
-static int subtitle_stream_copy = 0;
+static int64_t recording_time;
+static int64_t start_time;
+static int64_t rec_timestamp;
+static int64_t input_ts_offset;
+static int file_overwrite;
+static char *str_title;
+static char *str_author;
+static char *str_copyright;
+static char *str_comment;
+static char *str_album;
+static int do_benchmark;
+static int do_hex_dump;
+static int do_pkt_dump;
+static int do_psnr;
+static int do_vstats;
+static int do_pass;
+static char *pass_logfilename;
+static int audio_stream_copy;
+static int video_stream_copy;
+static int subtitle_stream_copy;
 static int video_sync_method= 1;
-static int audio_sync_method= 0;
-static int copy_ts= 0;
-static int opt_shortest = 0; //
-static int video_global_header = 0;
+static int audio_sync_method;
+static int copy_ts;
+static int opt_shortest; //
+static int video_global_header;
 
-static int rate_emu = 0;
+static int rate_emu;
 
-static int  video_channel = 0;
+static int  video_channel;
 static char *video_standard = "ntsc";
 
 static int audio_volume = 256;
 
-static int using_stdin = 0;
-static int using_vhook = 0;
+static int using_stdin;
+static int using_vhook;
 static int verbose = 1;
 static int thread_count= 1;
-static int q_pressed = 0;
-static int64_t video_size = 0;
-static int64_t audio_size = 0;
-static int64_t extra_size = 0;
-static int nb_frames_dup = 0;
-static int nb_frames_drop = 0;
+static int q_pressed;
+static int64_t video_size;
+static int64_t audio_size;
+static int64_t extra_size;
+static int nb_frames_dup;
+static int nb_frames_drop;
 static int input_sync;
-static uint64_t limit_filesize = 0; //
+static uint64_t limit_filesize; //
 
-static int pgmyuv_compatibility_hack=0;
+static int pgmyuv_compatibility_hack;
 static int dts_delta_threshold = 10;
 
 static int sws_flags = SWS_BICUBIC;
 
-const char **opt_names=NULL;
-int opt_name_count=0;
+const char **opt_names;
+int opt_name_count;
 AVCodecContext *avctx_opts[CODEC_TYPE_NB];
 AVFormatContext *avformat_opts;
-static int64_t timer_start = 0;
+static int64_t timer_start;
 
-static AVBitStreamFilterContext *video_bitstream_filters=NULL;
-static AVBitStreamFilterContext *audio_bitstream_filters=NULL;
+static AVBitStreamFilterContext *video_bitstream_filters;
+static AVBitStreamFilterContext *audio_bitstream_filters;
 static AVBitStreamFilterContext *bitstream_filters[MAX_FILES][MAX_STREAMS];
 
 #define DEFAULT_PASS_LOGFILENAME "ffmpeg2pass"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 481 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20070401/28ce7035/attachment.pgp>



More information about the ffmpeg-devel mailing list