RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: Remove the micor like "#if 1"

Browse Source 
They are come from 2003 and delete them.

Signed-off-by: Jun Zhao <mypopydev@gmail.com>
This commit is contained in:
Jun Zhao 2018-11-09 14:11:24 +08:00 committed by Jun Zhao
parent c305e134ce
commit 81f2a9f136
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fftools/ffmpeg.c
View File

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