fftools/ffmpeg: write the header for stream-less outputs when initializing the muxer
There is no reason to delay this.
This commit is contained in:
		
							parent
							
								
									12e9e50219
								
							
						
					
					
						commit
						cc49646077
					
				@ -3274,7 +3274,6 @@ static void report_new_stream(int input_index, AVPacket *pkt)
 | 
				
			|||||||
static int transcode_init(void)
 | 
					static int transcode_init(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    int ret = 0, i, j, k;
 | 
					    int ret = 0, i, j, k;
 | 
				
			||||||
    AVFormatContext *oc;
 | 
					 | 
				
			||||||
    OutputStream *ost;
 | 
					    OutputStream *ost;
 | 
				
			||||||
    InputStream *ist;
 | 
					    InputStream *ist;
 | 
				
			||||||
    char error[1024] = {0};
 | 
					    char error[1024] = {0};
 | 
				
			||||||
@ -3348,16 +3347,6 @@ static int transcode_init(void)
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* write headers for files with no streams */
 | 
					 | 
				
			||||||
    for (i = 0; i < nb_output_files; i++) {
 | 
					 | 
				
			||||||
        oc = output_files[i]->ctx;
 | 
					 | 
				
			||||||
        if (output_files[i]->format->flags & AVFMT_NOSTREAMS && oc->nb_streams == 0) {
 | 
					 | 
				
			||||||
            ret = of_check_init(output_files[i]);
 | 
					 | 
				
			||||||
            if (ret < 0)
 | 
					 | 
				
			||||||
                goto dump_format;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 dump_format:
 | 
					 dump_format:
 | 
				
			||||||
    /* dump the stream mapping */
 | 
					    /* dump the stream mapping */
 | 
				
			||||||
    av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
 | 
					    av_log(NULL, AV_LOG_INFO, "Stream mapping:\n");
 | 
				
			||||||
 | 
				
			|||||||
@ -340,6 +340,13 @@ int of_muxer_init(OutputFile *of, int64_t limit_filesize)
 | 
				
			|||||||
    if (strcmp(of->format->name, "rtp"))
 | 
					    if (strcmp(of->format->name, "rtp"))
 | 
				
			||||||
        want_sdp = 0;
 | 
					        want_sdp = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /* write the header for files with no streams */
 | 
				
			||||||
 | 
					    if (of->format->flags & AVFMT_NOSTREAMS && of->ctx->nb_streams == 0) {
 | 
				
			||||||
 | 
					        int ret = of_check_init(of);
 | 
				
			||||||
 | 
					        if (ret < 0)
 | 
				
			||||||
 | 
					            return ret;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user