Remove redundant use of numchannels since it is 1 for mono.

[ffmpeg] / ffmpeg.c

diff --git a/ffmpeg.c b/ffmpeg.c
index cc88dfb087cf3f0a94fcebd3f9bd43e80b1e4927..720f8172fff4ec56b2d22066a835513035f40236 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1314,7 +1314,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
         ist->pts= ist->next_pts;
 
         if(avpkt.size && avpkt.size != pkt->size &&
-           (!ist->showed_multi_packet_warning && verbose>0 || verbose>1)){
+           ((!ist->showed_multi_packet_warning && verbose>0) || verbose>1)){
             fprintf(stderr, "Multiple frames in a packet from stream %d\n", pkt->stream_index);
             ist->showed_multi_packet_warning=1;
         }
@@ -2107,19 +2107,6 @@ static int av_encode(AVFormatContext **output_files,
         ist->is_start = 1;
     }
 
-    /* set the duration of the output to the duration of the input
-     * if the output ends up being different, it'll be corrected later */
-    for (i=0;i<nb_output_files;i++) {
-        AVFormatContext *out_file = output_files[i];
-        AVFormatContext *in_file = input_files[i];
-
-        if (recording_time != INT64_MAX) {
-            out_file->duration = recording_time / 1000000 * AV_TIME_BASE;
-        } else {
-            out_file->duration = in_file->duration;
-        }
-    }
-
     /* set meta data information from input file if required */
     for (i=0;i<nb_meta_data_maps;i++) {
         AVFormatContext *out_file;