RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 10:22:10 +00:00
Code Issues 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

40
avconv.c
View File

@ -1856,29 +1856,27 @@ 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: do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size); break;
break; case AVMEDIA_TYPE_VIDEO:
case AVMEDIA_TYPE_VIDEO:
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
if (ost->picref->video && !ost->frame_aspect_ratio) if (ost->picref->video && !ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect;
#endif #endif
do_video_out(os, ost, ist, filtered_frame, &frame_size, do_video_out(os, ost, ist, filtered_frame, &frame_size,
same_quant ? quality : ost->st->codec->global_quality); same_quant ? quality : ost->st->codec->global_quality);
if (vstats_filename && frame_size) if (vstats_filename && frame_size)
do_video_stats(os, ost, frame_size); do_video_stats(os, ost, frame_size);
break; break;
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
do_subtitle_out(os, ost, ist, &subtitle, do_subtitle_out(os, ost, ist, &subtitle,
pkt->pts); pkt->pts);
break; break;
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) &&