From 1bb77e51a824187a8d8ecff7208be7296767256b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 20 Nov 2011 12:23:55 +0100 Subject: avconv: rename 'os' variable to 'oc' Output AVFormatContext is called 'oc' in most other places. --- avconv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'avconv.c') diff --git a/avconv.c b/avconv.c index ef41245726..de737ec3ac 100644 --- a/avconv.c +++ b/avconv.c @@ -1961,7 +1961,7 @@ static int transcode_init(OutputFile *output_files, int nb_input_files) { int ret = 0, i, j, k; - AVFormatContext *os; + AVFormatContext *oc; AVCodecContext *codec, *icodec; OutputStream *ost; InputStream *ist; @@ -1978,9 +1978,9 @@ static int transcode_init(OutputFile *output_files, /* output stream init */ for(i=0;inb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) { - av_dump_format(os, i, os->filename, 1); + oc = output_files[i].ctx; + if (!oc->nb_streams && !(oc->oformat->flags & AVFMT_NOSTREAMS)) { + av_dump_format(oc, i, oc->filename, 1); av_log(NULL, AV_LOG_ERROR, "Output file #%d does not contain any stream\n", i); return AVERROR(EINVAL); } @@ -1989,7 +1989,7 @@ static int transcode_init(OutputFile *output_files, /* for each output stream, we compute the right encoding parameters */ for (i = 0; i < nb_output_streams; i++) { ost = &output_streams[i]; - os = output_files[ost->file_index].ctx; + oc = output_files[ost->file_index].ctx; ist = &input_streams[ost->source_index]; if (ost->attachment_filename) @@ -2014,9 +2014,9 @@ static int transcode_init(OutputFile *output_files, codec->codec_type = icodec->codec_type; if(!codec->codec_tag){ - if( !os->oformat->codec_tag - || av_codec_get_id (os->oformat->codec_tag, icodec->codec_tag) == codec->codec_id - || av_codec_get_tag(os->oformat->codec_tag, icodec->codec_id) <= 0) + if( !oc->oformat->codec_tag + || av_codec_get_id (oc->oformat->codec_tag, icodec->codec_tag) == codec->codec_id + || av_codec_get_tag(oc->oformat->codec_tag, icodec->codec_id) <= 0) codec->codec_tag = icodec->codec_tag; } @@ -2273,15 +2273,15 @@ static int transcode_init(OutputFile *output_files, /* open files and write file headers */ for (i = 0; i < nb_output_files; i++) { - os = output_files[i].ctx; - os->interrupt_callback = int_cb; - if (avformat_write_header(os, &output_files[i].opts) < 0) { + oc = output_files[i].ctx; + oc->interrupt_callback = int_cb; + if (avformat_write_header(oc, &output_files[i].opts) < 0) { snprintf(error, sizeof(error), "Could not write header for output file #%d (incorrect codec parameters ?)", i); ret = AVERROR(EINVAL); goto dump_format; } assert_avoptions(output_files[i].opts); - if (strcmp(os->oformat->name, "rtp")) { + if (strcmp(oc->oformat->name, "rtp")) { want_sdp = 0; } } -- cgit v1.2.3