---
 avconv.c |  156 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/avconv.c b/avconv.c
index ecbf523..7508367 100644
--- a/avconv.c
+++ b/avconv.c
@@ -589,10 +589,10 @@ static void assert_codec_experimental(AVCodecContext *c, 
int encoder)
 
 static void choose_sample_fmt(AVStream *st, AVCodec *codec)
 {
-    if(codec && codec->sample_fmts){
+    if (codec && codec->sample_fmts){
         const enum AVSampleFormat *p= codec->sample_fmts;
         for(; *p!=-1; p++){
-            if(*p == st->codec->sample_fmt)
+            if (*p == st->codec->sample_fmt)
                 break;
         }
         if (*p == -1) {
@@ -648,18 +648,18 @@ static void update_sample_fmt(AVCodecContext *dec, 
AVCodec *dec_codec,
 
 static void choose_sample_rate(AVStream *st, AVCodec *codec)
 {
-    if(codec && codec->supported_samplerates){
+    if (codec && codec->supported_samplerates){
         const int *p= codec->supported_samplerates;
         int best=0;
         int best_dist=INT_MAX;
         for(; *p; p++){
             int dist= abs(st->codec->sample_rate - *p);
-            if(dist < best_dist){
+            if (dist < best_dist){
                 best_dist= dist;
                 best= *p;
             }
         }
-        if(best_dist){
+        if (best_dist){
             av_log(st->codec, AV_LOG_WARNING, "Requested sampling rate 
unsupported using closest supported (%d)\n", best);
         }
         st->codec->sample_rate= best;
@@ -668,21 +668,21 @@ static void choose_sample_rate(AVStream *st, AVCodec 
*codec)
 
 static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
 {
-    if(codec && codec->pix_fmts){
+    if (codec && codec->pix_fmts){
         const enum PixelFormat *p= codec->pix_fmts;
-        if(st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL){
-            if(st->codec->codec_id==CODEC_ID_MJPEG){
+        if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL){
+            if (st->codec->codec_id==CODEC_ID_MJPEG){
                 p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, 
PIX_FMT_YUVJ422P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, PIX_FMT_NONE};
-            }else if(st->codec->codec_id==CODEC_ID_LJPEG){
+            }else if (st->codec->codec_id==CODEC_ID_LJPEG){
                 p= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, 
PIX_FMT_YUVJ422P, PIX_FMT_YUVJ444P, PIX_FMT_YUV420P, PIX_FMT_YUV422P, 
PIX_FMT_YUV444P, PIX_FMT_BGRA, PIX_FMT_NONE};
             }
         }
         for (; *p != PIX_FMT_NONE; p++) {
-            if(*p == st->codec->pix_fmt)
+            if (*p == st->codec->pix_fmt)
                 break;
         }
         if (*p == PIX_FMT_NONE) {
-            if(st->codec->pix_fmt != PIX_FMT_NONE)
+            if (st->codec->pix_fmt != PIX_FMT_NONE)
                 av_log(NULL, AV_LOG_WARNING,
                         "Incompatible pixel format '%s' for codec '%s', 
auto-selecting format '%s'\n",
                         av_pix_fmt_descriptors[st->codec->pix_fmt].name,
@@ -710,10 +710,10 @@ static void write_frame(AVFormatContext *s, AVPacket 
*pkt, AVCodecContext *avctx
                                           &new_pkt.data, &new_pkt.size,
                                           pkt->data, pkt->size,
                                           pkt->flags & AV_PKT_FLAG_KEY);
-        if(a>0){
+        if (a>0){
             av_free_packet(pkt);
             new_pkt.destruct= av_destruct_packet;
-        } else if(a<0){
+        } else if (a<0){
             av_log(NULL, AV_LOG_ERROR, "%s failed for stream %d, codec %s",
                    bsfc->filter->name, pkt->stream_index,
                    avctx->codec ? avctx->codec->name : "copy");
@@ -727,7 +727,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, 
AVCodecContext *avctx
     }
 
     ret= av_interleaved_write_frame(s, pkt);
-    if(ret < 0){
+    if (ret < 0){
         print_error("av_interleaved_write_frame()", ret);
         exit_program(1);
     }
@@ -765,11 +765,11 @@ need_realloc:
     audio_buf_size*= osize*enc->channels;
 
     audio_out_size= FFMAX(audio_buf_size, enc->frame_size * osize * 
enc->channels);
-    if(coded_bps > 8*osize)
+    if (coded_bps > 8*osize)
         audio_out_size= audio_out_size * coded_bps / (8*osize);
     audio_out_size += FF_MIN_BUFFER_SIZE;
 
-    if(audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
+    if (audio_out_size > INT_MAX || audio_buf_size > INT_MAX){
         av_log(NULL, AV_LOG_FATAL, "Buffer sizes too large\n");
         exit_program(1);
     }
@@ -839,29 +839,29 @@ need_realloc:
         ost->reformat_pair=MAKE_SFMT_PAIR(enc->sample_fmt,dec->sample_fmt);
     }
 
-    if(audio_sync_method){
+    if (audio_sync_method){
         double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts
                 - av_fifo_size(ost->fifo)/(enc->channels * osize);
         int idelta = delta * dec->sample_rate / enc->sample_rate;
         int byte_delta = idelta * isize * dec->channels;
 
         //FIXME resample delay
-        if(fabs(delta) > 50){
-            if(ist->is_start || fabs(delta) > 
audio_drift_threshold*enc->sample_rate){
-                if(byte_delta < 0){
+        if (fabs(delta) > 50){
+            if (ist->is_start || fabs(delta) > 
audio_drift_threshold*enc->sample_rate){
+                if (byte_delta < 0){
                     byte_delta= FFMAX(byte_delta, -size);
                     size += byte_delta;
                     buf  -= byte_delta;
                     av_log(NULL, AV_LOG_VERBOSE, "discarding %d audio 
samples\n",
                            -byte_delta / (isize * dec->channels));
-                    if(!size)
+                    if (!size)
                         return;
                     ist->is_start=0;
                 }else{
                     static uint8_t *input_tmp= NULL;
                     input_tmp= av_realloc(input_tmp, byte_delta + size);
 
-                    if(byte_delta > allocated_for_size - size){
+                    if (byte_delta > allocated_for_size - size){
                         allocated_for_size= byte_delta + (int64_t)size;
                         goto need_realloc;
                     }
@@ -873,7 +873,7 @@ need_realloc:
                     size += byte_delta;
                     av_log(NULL, AV_LOG_VERBOSE, "adding %d audio samples of 
silence\n", idelta);
                 }
-            }else if(audio_sync_method>1){
+            }else if (audio_sync_method>1){
                 int comp= av_clip(delta, -audio_sync_method, 
audio_sync_method);
                 av_assert0(ost->audio_resample);
                 av_log(NULL, AV_LOG_VERBOSE, "compensating audio timestamp 
drift:%f compensation:%d in:%d\n",
@@ -942,7 +942,7 @@ need_realloc:
             pkt.stream_index= ost->index;
             pkt.data= audio_out;
             pkt.size= ret;
-            if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+            if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
                 pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, 
ost->st->time_base);
             pkt.flags |= AV_PKT_FLAG_KEY;
             write_frame(s, &pkt, enc, ost->bitstream_filters);
@@ -961,7 +961,7 @@ need_realloc:
         if (coded_bps)
             size_out = size_out*coded_bps/8;
 
-        if(size_out > audio_out_size){
+        if (size_out > audio_out_size){
             av_log(NULL, AV_LOG_FATAL, "Internal error, buffer size too 
small\n");
             exit_program(1);
         }
@@ -977,7 +977,7 @@ need_realloc:
         pkt.stream_index= ost->index;
         pkt.data= audio_out;
         pkt.size= ret;
-        if(enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
+        if (enc->coded_frame && enc->coded_frame->pts != AV_NOPTS_VALUE)
             pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, 
ost->st->time_base);
         pkt.flags |= AV_PKT_FLAG_KEY;
         write_frame(s, &pkt, enc, ost->bitstream_filters);
@@ -1006,7 +1006,7 @@ static void pre_process_video_frame(InputStream *ist, 
AVPicture *picture, void *
         picture2 = &picture_tmp;
         avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
 
-        if(avpicture_deinterlace(picture2, picture,
+        if (avpicture_deinterlace(picture2, picture,
                                  dec->pix_fmt, dec->width, dec->height) < 0) {
             /* if error, do not deinterlace */
             av_log(NULL, AV_LOG_WARNING, "Deinterlacing failed\n");
@@ -1108,7 +1108,7 @@ static void do_video_resample(OutputStream *ost,
                ist->file_index, ist->st->index,
                ost->resample_width, ost->resample_height, 
av_get_pix_fmt_name(ost->resample_pix_fmt),
                dec->width         , dec->height         , 
av_get_pix_fmt_name(dec->pix_fmt));
-        if(!ost->video_resample)
+        if (!ost->video_resample)
             ost->video_resample = 1;
     }
 
@@ -1182,9 +1182,9 @@ static void do_video_out(AVFormatContext *s,
         if (vdelta < -1.1)
             nb_frames = 0;
         else if (format_video_sync == 2) {
-            if(vdelta<=-0.6){
+            if (vdelta<=-0.6){
                 nb_frames=0;
-            }else if(vdelta>0.6)
+            }else if (vdelta>0.6)
                 ost->sync_opts= lrintf(sync_ipts);
         }else if (vdelta > 1.1)
             nb_frames = lrintf(vdelta);
@@ -1260,16 +1260,16 @@ static void do_video_out(AVFormatContext *s,
                 exit_program(1);
             }
 
-            if(ret>0){
+            if (ret>0){
                 pkt.data= bit_buffer;
                 pkt.size= ret;
-                if(enc->coded_frame->pts != AV_NOPTS_VALUE)
+                if (enc->coded_frame->pts != AV_NOPTS_VALUE)
                     pkt.pts= av_rescale_q(enc->coded_frame->pts, 
enc->time_base, ost->st->time_base);
 /*av_log(NULL, AV_LOG_DEBUG, "encoder -> %"PRId64"/%"PRId64"\n",
    pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, 
AV_TIME_BASE*(int64_t)enc->time_base.num) : -1,
    pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, 
AV_TIME_BASE*(int64_t)enc->time_base.num) : -1);*/
 
-                if(enc->coded_frame->key_frame)
+                if (enc->coded_frame->key_frame)
                     pkt.flags |= AV_PKT_FLAG_KEY;
                 write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
                 *frame_size = ret;
@@ -1362,7 +1362,7 @@ static void print_report(OutputFile *output_files,
     oc = output_files[0].ctx;
 
     total_size = avio_size(oc->pb);
-    if(total_size<0) // FIXME improve avio_size() so it works with non 
seekable output too
+    if (total_size<0) // FIXME improve avio_size() so it works with non 
seekable output too
         total_size= avio_tell(oc->pb);
 
     buf[0] = '\0';
@@ -1383,12 +1383,12 @@ static void print_report(OutputFile *output_files,
             frame_number = ost->frame_number;
             snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "frame=%5d 
fps=%3d q=%3.1f ",
                      frame_number, (t>1)?(int)(frame_number/t+0.5) : 0, q);
-            if(is_last_report)
+            if (is_last_report)
                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "L");
-            if(qp_hist){
+            if (qp_hist){
                 int j;
                 int qp = lrintf(q);
-                if(qp>=0 && qp<FF_ARRAY_ELEMS(qp_histogram))
+                if (qp>=0 && qp<FF_ARRAY_ELEMS(qp_histogram))
                     qp_histogram[qp]++;
                 for(j=0; j<32; j++)
                     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), 
"%X", (int)lrintf(log(qp_histogram[j]+1)/log(2)));
@@ -1400,14 +1400,14 @@ static void print_report(OutputFile *output_files,
                 char type[3]= {'Y','U','V'};
                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), 
"PSNR=");
                 for(j=0; j<3; j++){
-                    if(is_last_report){
+                    if (is_last_report){
                         error= enc->error[j];
                         scale= enc->width*enc->height*255.0*255.0*frame_number;
                     }else{
                         error= enc->coded_frame->error[j];
                         scale= enc->width*enc->height*255.0*255.0;
                     }
-                    if(j) scale/=4;
+                    if (j) scale/=4;
                     error_sum += error;
                     scale_sum += scale;
                     snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), 
"%c:%2.2f ", type[j], psnr(error/scale));
@@ -1514,7 +1514,7 @@ static void flush_encoders(OutputStream *ost_table, int 
nb_ostreams)
                     exit_program(1);
                 }
                 video_size += ret;
-                if(enc->coded_frame && enc->coded_frame->key_frame)
+                if (enc->coded_frame && enc->coded_frame->key_frame)
                     pkt.flags |= AV_PKT_FLAG_KEY;
                 if (ost->logfile && enc->stats_out) {
                     fprintf(ost->logfile, "%s", enc->stats_out);
@@ -1595,7 +1595,7 @@ static void do_streamcopy(InputStream *ist, OutputStream 
*ost, const AVPacket *p
     opkt.flags    = pkt->flags;
 
     //FIXME remove the following 2 lines they shall be replaced by the 
bitstream filters
-    if(   ost->st->codec->codec_id != CODEC_ID_H264
+    if (   ost->st->codec->codec_id != CODEC_ID_H264
        && ost->st->codec->codec_id != CODEC_ID_MPEG1VIDEO
        && ost->st->codec->codec_id != CODEC_ID_MPEG2VIDEO
        ) {
@@ -1870,9 +1870,9 @@ static int output_packet(InputStream *ist,
         avpkt = *pkt;
     }
 
-    if(pkt->dts != AV_NOPTS_VALUE)
+    if (pkt->dts != AV_NOPTS_VALUE)
         ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, 
AV_TIME_BASE_Q);
-    if(pkt->pts != AV_NOPTS_VALUE)
+    if (pkt->pts != AV_NOPTS_VALUE)
         pkt_pts = av_rescale_q(pkt->pts, ist->st->time_base, AV_TIME_BASE_Q);
 
     //while we have more to decode or while the decoder did output something 
on EOF
@@ -2086,7 +2086,7 @@ static int transcode_init(OutputFile *output_files,
 
             switch(codec->codec_type) {
             case AVMEDIA_TYPE_AUDIO:
-                if(audio_volume != 256) {
+                if (audio_volume != 256) {
                     av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are 
incompatible (frames are not decoded)\n");
                     exit_program(1);
                 }
@@ -2177,7 +2177,7 @@ static int transcode_init(OutputFile *output_files,
                 if (ost->video_resample) {
 #if !CONFIG_AVFILTER
                     avcodec_get_frame_defaults(&ost->pict_tmp);
-                    if(avpicture_alloc((AVPicture*)&ost->pict_tmp, 
codec->pix_fmt,
+                    if (avpicture_alloc((AVPicture*)&ost->pict_tmp, 
codec->pix_fmt,
                                        codec->width, codec->height)) {
                         av_log(NULL, AV_LOG_FATAL, "Cannot allocate temp 
picture, check pix fmt\n");
                         exit_program(1);
@@ -2251,7 +2251,7 @@ static int transcode_init(OutputFile *output_files,
                 }
             }
         }
-        if(codec->codec_type == AVMEDIA_TYPE_VIDEO){
+        if (codec->codec_type == AVMEDIA_TYPE_VIDEO){
             int        size = codec->width * codec->height;
             bit_buffer_size = FFMAX(bit_buffer_size, 6*size + 200);
         }
@@ -2442,13 +2442,13 @@ static int transcode(OutputFile *output_files,
             opts = ost->st->pts.val * av_q2d(ost->st->time_base);
             ipts = ist->pts;
             if (!input_files[ist->file_index].eof_reached){
-                if(ipts < ipts_min) {
+                if (ipts < ipts_min) {
                     ipts_min = ipts;
-                    if(input_sync ) file_index = ist->file_index;
+                    if (input_sync ) file_index = ist->file_index;
                 }
-                if(opts < opts_min) {
+                if (opts < opts_min) {
                     opts_min = opts;
-                    if(!input_sync) file_index = ist->file_index;
+                    if (!input_sync) file_index = ist->file_index;
                 }
             }
             if (ost->frame_number >= ost->max_frames) {
@@ -2460,7 +2460,7 @@ static int transcode(OutputFile *output_files,
         }
         /* if none, if is finished */
         if (file_index < 0) {
-            if(no_packet_count){
+            if (no_packet_count){
                 no_packet_count=0;
                 memset(no_packet, 0, nb_input_files);
                 usleep(10000);
@@ -2472,7 +2472,7 @@ static int transcode(OutputFile *output_files,
         /* read a frame from it and output it in the fifo */
         is = input_files[file_index].ctx;
         ret= av_read_frame(is, &pkt);
-        if(ret == AVERROR(EAGAIN)){
+        if (ret == AVERROR(EAGAIN)){
             no_packet[file_index]=1;
             no_packet_count++;
             continue;
@@ -2506,9 +2506,9 @@ static int transcode(OutputFile *output_files,
         if (pkt.pts != AV_NOPTS_VALUE)
             pkt.pts += av_rescale_q(input_files[ist->file_index].ts_offset, 
AV_TIME_BASE_Q, ist->st->time_base);
 
-        if(pkt.pts != AV_NOPTS_VALUE)
+        if (pkt.pts != AV_NOPTS_VALUE)
             pkt.pts *= ist->ts_scale;
-        if(pkt.dts != AV_NOPTS_VALUE)
+        if (pkt.dts != AV_NOPTS_VALUE)
             pkt.dts *= ist->ts_scale;
 
 //        fprintf(stderr, "next:%"PRId64" dts:%"PRId64" off:%"PRId64" %d\n", 
ist->next_pts, pkt.dts, input_files[ist->file_index].ts_offset, 
ist->st->codec->codec_type);
@@ -2516,12 +2516,12 @@ static int transcode(OutputFile *output_files,
             && (is->iformat->flags & AVFMT_TS_DISCONT)) {
             int64_t pkt_dts= av_rescale_q(pkt.dts, ist->st->time_base, 
AV_TIME_BASE_Q);
             int64_t delta= pkt_dts - ist->next_pts;
-            if((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || 
pkt_dts+1<ist->pts)&& !copy_ts){
+            if ((FFABS(delta) > 1LL*dts_delta_threshold*AV_TIME_BASE || 
pkt_dts+1<ist->pts)&& !copy_ts){
                 input_files[ist->file_index].ts_offset -= delta;
                 av_log(NULL, AV_LOG_DEBUG, "timestamp discontinuity %"PRId64", 
new offset= %"PRId64"\n",
                        delta, input_files[ist->file_index].ts_offset);
                 pkt.dts-= av_rescale_q(delta, AV_TIME_BASE_Q, 
ist->st->time_base);
-                if(pkt.pts != AV_NOPTS_VALUE)
+                if (pkt.pts != AV_NOPTS_VALUE)
                     pkt.pts-= av_rescale_q(delta, AV_TIME_BASE_Q, 
ist->st->time_base);
             }
         }
@@ -2868,11 +2868,11 @@ static AVCodec *find_codec_or_die(const char *name, 
enum AVMediaType type, int e
     codec = encoder ?
         avcodec_find_encoder_by_name(name) :
         avcodec_find_decoder_by_name(name);
-    if(!codec) {
+    if (!codec) {
         av_log(NULL, AV_LOG_FATAL, "Unknown %s '%s'\n", codec_string, name);
         exit_program(1);
     }
-    if(codec->type != type) {
+    if (codec->type != type) {
         av_log(NULL, AV_LOG_FATAL, "Invalid %s type '%s'\n", codec_string, 
name);
         exit_program(1);
     }
@@ -2940,7 +2940,7 @@ static void add_input_streams(OptionsContext *o, 
AVFormatContext *ic)
 
             if (o->video_disable)
                 st->discard= AVDISCARD_ALL;
-            else if(video_discard)
+            else if (video_discard)
                 st->discard= video_discard;
             break;
         case AVMEDIA_TYPE_DATA:
@@ -3323,10 +3323,10 @@ static void parse_matrix_coeffs(uint16_t *dest, const 
char *str)
     const char *p = str;
     for(i = 0;; i++) {
         dest[i] = atoi(p);
-        if(i == 63)
+        if (i == 63)
             break;
         p = strchr(p, ',');
-        if(!p) {
+        if (!p) {
             av_log(NULL, AV_LOG_FATAL, "Syntax error in matrix \"%s\" at coeff 
%d\n", str, i);
             exit_program(1);
         }
@@ -3395,7 +3395,7 @@ static OutputStream *new_video_stream(OptionsContext *o, 
AVFormatContext *oc)
         for(i=0; p; i++){
             int start, end, q;
             int e=sscanf(p, "%d,%d,%d", &start, &end, &q);
-            if(e!=3){
+            if (e!=3){
                 av_log(NULL, AV_LOG_FATAL, "error parsing rc_override\n");
                 exit_program(1);
             }
@@ -3404,7 +3404,7 @@ static OutputStream *new_video_stream(OptionsContext *o, 
AVFormatContext *oc)
                            sizeof(RcOverride)*(i+1));
             video_enc->rc_override[i].start_frame= start;
             video_enc->rc_override[i].end_frame  = end;
-            if(q>0){
+            if (q>0){
                 video_enc->rc_override[i].qscale= q;
                 video_enc->rc_override[i].quality_factor= 1.0;
             }
@@ -3413,7 +3413,7 @@ static OutputStream *new_video_stream(OptionsContext *o, 
AVFormatContext *oc)
                 video_enc->rc_override[i].quality_factor= -q/100.0;
             }
             p= strchr(p, '/');
-            if(p) p++;
+            if (p) p++;
         }
         video_enc->rc_override_count=i;
         if (!video_enc->rc_initial_buffer_occupancy)
@@ -3950,34 +3950,34 @@ static int opt_target(OptionsContext *o, const char 
*opt, const char *arg)
     enum { PAL, NTSC, FILM, UNKNOWN } norm = UNKNOWN;
     static const char *const frame_rates[] = {"25", "30000/1001", 
"24000/1001"};
 
-    if(!strncmp(arg, "pal-", 4)) {
+    if (!strncmp(arg, "pal-", 4)) {
         norm = PAL;
         arg += 4;
-    } else if(!strncmp(arg, "ntsc-", 5)) {
+    } else if (!strncmp(arg, "ntsc-", 5)) {
         norm = NTSC;
         arg += 5;
-    } else if(!strncmp(arg, "film-", 5)) {
+    } else if (!strncmp(arg, "film-", 5)) {
         norm = FILM;
         arg += 5;
     } else {
         /* Try to determine PAL/NTSC by peeking in the input files */
-        if(nb_input_files) {
+        if (nb_input_files) {
             int i, j, fr;
             for (j = 0; j < nb_input_files; j++) {
                 for (i = 0; i < input_files[j].nb_streams; i++) {
                     AVCodecContext *c = input_files[j].ctx->streams[i]->codec;
-                    if(c->codec_type != AVMEDIA_TYPE_VIDEO)
+                    if (c->codec_type != AVMEDIA_TYPE_VIDEO)
                         continue;
                     fr = c->time_base.den * 1000 / c->time_base.num;
-                    if(fr == 25000) {
+                    if (fr == 25000) {
                         norm = PAL;
                         break;
-                    } else if((fr == 29970) || (fr == 23976)) {
+                    } else if ((fr == 29970) || (fr == 23976)) {
                         norm = NTSC;
                         break;
                     }
                 }
-                if(norm != UNKNOWN)
+                if (norm != UNKNOWN)
                     break;
             }
         }
@@ -3985,14 +3985,14 @@ static int opt_target(OptionsContext *o, const char 
*opt, const char *arg)
             av_log(NULL, AV_LOG_INFO, "Assuming %s for target.\n", norm == PAL 
? "PAL" : "NTSC");
     }
 
-    if(norm == UNKNOWN) {
+    if (norm == UNKNOWN) {
         av_log(NULL, AV_LOG_FATAL, "Could not determine norm 
(PAL/NTSC/NTSC-Film) for target.\n");
         av_log(NULL, AV_LOG_FATAL, "Please prefix target with \"pal-\", 
\"ntsc-\" or \"film-\",\n");
         av_log(NULL, AV_LOG_FATAL, "or set a framerate with \"-r xxx\".\n");
         exit_program(1);
     }
 
-    if(!strcmp(arg, "vcd")) {
+    if (!strcmp(arg, "vcd")) {
         opt_video_codec(o, "c:v", "mpeg1video");
         opt_audio_codec(o, "c:a", "mp2");
         parse_option(o, "f", "vcd", options);
@@ -4019,7 +4019,7 @@ static int opt_target(OptionsContext *o, const char *opt, 
const char *arg)
            been written before.
            So the real data starts at SCR 36000+3*1200. */
         o->mux_preload = (36000+3*1200) / 90000.0; //0.44
-    } else if(!strcmp(arg, "svcd")) {
+    } else if (!strcmp(arg, "svcd")) {
 
         opt_video_codec(o, "c:v", "mpeg2video");
         opt_audio_codec(o, "c:a", "mp2");
@@ -4041,7 +4041,7 @@ static int opt_target(OptionsContext *o, const char *opt, 
const char *arg)
 
         opt_default("packetsize", "2324");
 
-    } else if(!strcmp(arg, "dvd")) {
+    } else if (!strcmp(arg, "dvd")) {
 
         opt_video_codec(o, "c:v", "mpeg2video");
         opt_audio_codec(o, "c:a", "ac3");
@@ -4062,7 +4062,7 @@ static int opt_target(OptionsContext *o, const char *opt, 
const char *arg)
         opt_default("b:a", "448000");
         parse_option(o, "ar", "48000", options);
 
-    } else if(!strncmp(arg, "dv", 2)) {
+    } else if (!strncmp(arg, "dv", 2)) {
 
         parse_option(o, "f", "dv", options);
 
@@ -4272,7 +4272,7 @@ int main(int argc, char **argv)
     /* parse options */
     parse_options(&o, argc, argv, options, opt_output_file);
 
-    if(nb_output_files <= 0 && nb_input_files == 0) {
+    if (nb_output_files <= 0 && nb_input_files == 0) {
         show_usage();
         av_log(NULL, AV_LOG_WARNING, "Use -h to get full help or, even better, 
run 'man %s'\n", program_name);
         exit_program(1);
-- 
1.7.4.1

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to