Revision 610219a5 ffmpeg.c

View differences:

ffmpeg.c
1977 1977
    for(i=0;i<nb_output_files;i++) {
1978 1978
        os = output_files[i];
1979 1979
        if (!os->nb_streams && !(os->oformat->flags & AVFMT_NOSTREAMS)) {
1980
            dump_format(output_files[i], i, output_files[i]->filename, 1);
1980
            av_dump_format(output_files[i], i, output_files[i]->filename, 1);
1981 1981
            fprintf(stderr, "Output file #%d does not contain any stream\n", i);
1982 1982
            ret = AVERROR(EINVAL);
1983 1983
            goto fail;
......
2028 2028
                /* Sanity check that the stream types match */
2029 2029
                if (ist_table[ost->source_index]->st->codec->codec_type != ost->st->codec->codec_type) {
2030 2030
                    int i= ost->file_index;
2031
                    dump_format(output_files[i], i, output_files[i]->filename, 1);
2031
                    av_dump_format(output_files[i], i, output_files[i]->filename, 1);
2032 2032
                    fprintf(stderr, "Codec type mismatch for mapping #%d.%d -> #%d.%d\n",
2033 2033
                        stream_maps[n].file_index, stream_maps[n].stream_index,
2034 2034
                        ost->file_index, ost->index);
......
2079 2079
                    }
2080 2080
                    if (!found) {
2081 2081
                        int i= ost->file_index;
2082
                        dump_format(output_files[i], i, output_files[i]->filename, 1);
2082
                        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
2083 2083
                        fprintf(stderr, "Could not find input stream matching output stream #%d.%d\n",
2084 2084
                                ost->file_index, ost->index);
2085 2085
                        ffmpeg_exit(1);
......
2459 2459
    /* dump the file output parameters - cannot be done before in case
2460 2460
       of stream copy */
2461 2461
    for(i=0;i<nb_output_files;i++) {
2462
        dump_format(output_files[i], i, output_files[i]->filename, 1);
2462
        av_dump_format(output_files[i], i, output_files[i]->filename, 1);
2463 2463
    }
2464 2464

  
2465 2465
    /* dump the stream mapping */
......
3309 3309
    input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp);
3310 3310
    /* dump the file content */
3311 3311
    if (verbose >= 0)
3312
        dump_format(ic, nb_input_files, filename, 0);
3312
        av_dump_format(ic, nb_input_files, filename, 0);
3313 3313

  
3314 3314
    nb_input_files++;
3315 3315

  

Also available in: Unified diff