aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-16 23:50:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-17 00:06:12 +0200
commit3e0b29ccd075039d4494cafd4738bdf8322068b0 (patch)
tree41467c62f30ce98d816a2a2a1a7a8b3142891e11 /ffmpeg.c
parenta07e9d72a1d97dc6a4d57e1f7b708e54e7db83f5 (diff)
downloadffmpeg-3e0b29ccd075039d4494cafd4738bdf8322068b0.tar.gz
ffmpeg: Make video filter graph reinit user selectable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 97a1e4dff5..e69eb89311 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1610,12 +1610,13 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
ist->resample_height = decoded_frame->height;
ist->resample_pix_fmt = decoded_frame->format;
- for (i = 0; i < nb_filtergraphs; i++)
- if (ist_in_filtergraph(filtergraphs[i], ist) &&
+ for (i = 0; i < nb_filtergraphs; i++) {
+ if (ist_in_filtergraph(filtergraphs[i], ist) && ist->reinit_filters &&
configure_filtergraph(filtergraphs[i]) < 0) {
av_log(NULL, AV_LOG_FATAL, "Error reinitializing filters!\n");
exit(1);
}
+ }
}
frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");