virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-09-16 08:36:51 +02:00
Code Issues Releases Activity

ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

Browse Source 
Fixes Ticket3562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-09-11 04:55:58 +02:00
parent 5e3da25618
commit 16de4d927e
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@@ -1821,18 +1821,10 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
for (i = 0; i < nb_filtergraphs; i++) for (i = 0; i < nb_filtergraphs; i++)
if (ist_in_filtergraph(filtergraphs[i], ist)) { if (ist_in_filtergraph(filtergraphs[i], ist)) {
FilterGraph *fg = filtergraphs[i]; FilterGraph *fg = filtergraphs[i];
int j;
if (configure_filtergraph(fg) < 0) { if (configure_filtergraph(fg) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n"); av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
exit_program(1); exit_program(1);
} }
for (j = 0; j < fg->nb_outputs; j++) {
OutputStream *ost = fg->outputs[j]->ost;
if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
!(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
av_buffersink_set_frame_size(ost->filter->filter,
ost->enc_ctx->frame_size);
}
} }
} }

10
ffmpeg_filter.c
View File

@@ -928,6 +928,16 @@ int configure_filtergraph(FilterGraph *fg)
} }
fg->reconfiguration = 1; fg->reconfiguration = 1;
for (i = 0; i < fg->nb_outputs; i++) {
OutputStream *ost = fg->outputs[i]->ost;
if (ost &&
ost->enc->type == AVMEDIA_TYPE_AUDIO &&
!(ost->enc->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE))
av_buffersink_set_frame_size(ost->filter->filter,
ost->enc_ctx->frame_size);
}
return 0; return 0;
} }