har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avconv: remove an always true condition and reindent.

Browse Source
This commit is contained in:
Anton Khirnov 2011-11-21 13:51:51 +01:00
parent 7204ec1a88
commit 51aeb69452
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avconv.c
View File

@ -1856,7 +1856,6 @@ static int output_packet(InputStream *ist, int ist_index,
/* set the input output pts pairs */ /* set the input output pts pairs */
//ost->sync_ipts = (double)(ist->pts + input_files[ist->file_index].ts_offset - start_time)/ AV_TIME_BASE; //ost->sync_ipts = (double)(ist->pts + input_files[ist->file_index].ts_offset - start_time)/ AV_TIME_BASE;
if (ost->encoding_needed) {
av_assert0(ist->decoding_needed); av_assert0(ist->decoding_needed);
switch(ost->st->codec->codec_type) { switch(ost->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
@ -1879,7 +1878,6 @@ static int output_packet(InputStream *ist, int ist_index,
default: default:
abort(); abort();
} }
}
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) &&
ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]);