diff options
| author | Nicolas George <george@nsup.org> | 2014-01-18 00:34:17 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-20 22:28:01 +0100 |
| commit | fc5261c2190505a6d569afa6c7ada7a18b6c4998 (patch) | |
| tree | f845258883ceb88818e4e1c6c8cd4672aea6c432 | |
| parent | 30a94f1159d4715b1fae906925dd6e852269a2ac (diff) | |
| download | android_external_ffmpeg-fc5261c2190505a6d569afa6c7ada7a18b6c4998.tar.gz android_external_ffmpeg-fc5261c2190505a6d569afa6c7ada7a18b6c4998.tar.bz2 android_external_ffmpeg-fc5261c2190505a6d569afa6c7ada7a18b6c4998.zip | |
lavfi/dualinput: fix shortest option.
Fix trac ticket #3315.
(cherry picked from commit 2dc5980d61493e05ccb04271a685fe804d87b155)
| -rw-r--r-- | libavfilter/dualinput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c index 97e15cbe01..88f7a272f1 100644 --- a/libavfilter/dualinput.c +++ b/libavfilter/dualinput.c @@ -57,7 +57,7 @@ int ff_dualinput_init(AVFilterContext *ctx, FFDualInputContext *s) in[1].after = EXT_INFINITY; if (s->shortest) - in[1].after = EXT_STOP; + in[0].after = in[1].after = EXT_STOP; if (!s->repeatlast) { in[0].after = EXT_STOP; in[1].sync = 0; |