[FFmpeg-devel] [PATCH V2 1/3] fftools/ffmpeg: Remove the micor like "#if 1"

Jun Zhao mypopydev at gmail.com
Fri Nov 9 15:11:31 EET 2018


They are come from 2003 and delete them.

Signed-off-by: Jun Zhao <mypopydev at gmail.com>
---
 fftools/ffmpeg.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index da4259a..9dc42f5 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -1210,11 +1210,7 @@ static void do_video_out(OutputFile *of,
 
     in_picture->pts = ost->sync_opts;
 
-#if 1
     if (!check_recording_time(ost))
-#else
-    if (ost->frame_number >= ost->max_frames)
-#endif
         return;
 
     {
@@ -2315,14 +2311,12 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output,
     ist->samples_decoded += decoded_frame->nb_samples;
     ist->frames_decoded++;
 
-#if 1
     /* increment next_dts to use for the case where the input stream does not
        have timestamps or there are multiple frames in the packet */
     ist->next_pts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
                      avctx->sample_rate;
     ist->next_dts += ((int64_t)AV_TIME_BASE * decoded_frame->nb_samples) /
                      avctx->sample_rate;
-#endif
 
     if (decoded_frame->pts != AV_NOPTS_VALUE) {
         decoded_frame_tb   = ist->st->time_base;
-- 
1.7.1



More information about the ffmpeg-devel mailing list