| Message ID | 1541769093-31787-2-git-send-email-mypopydev@gmail.com |
|---|---|
| State | Accepted |
| Commit | 81f2a9f136ca76579adb848dd2ff8dde3bd6393f |
| Headers | show |
On Fri, Nov 09, 2018 at 09:11:31PM +0800, Jun Zhao wrote: > They are come from 2003 and delete them. > > Signed-off-by: Jun Zhao <mypopydev@gmail.com> > --- > fftools/ffmpeg.c | 6 ------ > 1 files changed, 0 insertions(+), 6 deletions(-) LGTM thx [...]
On Sun, Nov 11, 2018 at 4:47 AM Michael Niedermayer <michael@niedermayer.cc> wrote: > > On Fri, Nov 09, 2018 at 09:11:31PM +0800, Jun Zhao wrote: > > They are come from 2003 and delete them. > > > > Signed-off-by: Jun Zhao <mypopydev@gmail.com> > > --- > > fftools/ffmpeg.c | 6 ------ > > 1 files changed, 0 insertions(+), 6 deletions(-) > > LGTM > > thx > Thanks the review, pushed
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;
They are come from 2003 and delete them. Signed-off-by: Jun Zhao <mypopydev@gmail.com> --- fftools/ffmpeg.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)