apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-21 07:59:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg: move some stream initialization code to ffmpeg_mux

Browse Source 
The code in question is muxing-specific and so belongs there. This will
allow make some objects private to the muxer in future commits.
This commit is contained in:
Anton Khirnov
2022-10-11 13:38:17 +02:00
parent 731246ae8f
commit 965bff37b6
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fftools/ffmpeg.c
View File

@@ -3115,7 +3115,6 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
static int init_output_stream(OutputStream *ost, AVFrame *frame,
char *error, int error_len)
{
OutputFile *of = output_files[ost->file_index];
int ret = 0;
if (ost->enc_ctx) {
@@ -3220,12 +3219,7 @@ static int init_output_stream(OutputStream *ost, AVFrame *frame,
if (ret < 0)
return ret;
if (ost->sq_idx_mux >= 0)
sq_set_tb(of->sq_mux, ost->sq_idx_mux, ost->mux_timebase);
ost->initialized = 1;
ret = of_check_init(output_files[ost->file_index]);
ret = of_stream_init(output_files[ost->file_index], ost);
if (ret < 0)
return ret;