diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-11-21 13:51:51 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-21 18:12:37 +0100 |
| commit | 51aeb6945251f91c8a9f79792706e77cf3742007 (patch) | |
| tree | 88910d388d26797ff001f2d92ec637fafe9a023f /avconv.c | |
| parent | 7204ec1a88ab286023cf9e1e096dac983c198a37 (diff) | |
| download | ffmpeg-streaming-51aeb6945251f91c8a9f79792706e77cf3742007.zip ffmpeg-streaming-51aeb6945251f91c8a9f79792706e77cf3742007.tar.gz | |
avconv: remove an always true condition and reindent.
Diffstat (limited to 'avconv.c')
| -rw-r--r-- | avconv.c | 40 |
1 files changed, 19 insertions, 21 deletions
@@ -1856,29 +1856,27 @@ static int output_packet(InputStream *ist, int ist_index, /* set the input output pts pairs */ //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); - switch(ost->st->codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size); - break; - case AVMEDIA_TYPE_VIDEO: + av_assert0(ist->decoding_needed); + switch(ost->st->codec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size); + break; + case AVMEDIA_TYPE_VIDEO: #if CONFIG_AVFILTER - if (ost->picref->video && !ost->frame_aspect_ratio) - ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; + if (ost->picref->video && !ost->frame_aspect_ratio) + ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; #endif - do_video_out(os, ost, ist, filtered_frame, &frame_size, - same_quant ? quality : ost->st->codec->global_quality); - if (vstats_filename && frame_size) - do_video_stats(os, ost, frame_size); - break; - case AVMEDIA_TYPE_SUBTITLE: - do_subtitle_out(os, ost, ist, &subtitle, - pkt->pts); - break; - default: - abort(); - } + do_video_out(os, ost, ist, filtered_frame, &frame_size, + same_quant ? quality : ost->st->codec->global_quality); + if (vstats_filename && frame_size) + do_video_stats(os, ost, frame_size); + break; + case AVMEDIA_TYPE_SUBTITLE: + do_subtitle_out(os, ost, ist, &subtitle, + pkt->pts); + break; + default: + abort(); } #if CONFIG_AVFILTER frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && |
