aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-06-27 19:03:42 +0200
committerwm4 <nfxjfg@googlemail.com>2017-03-03 08:45:43 +0100
commit76e13bdeaabc7ec49322b3a118dc4805153e0401 (patch)
tree3fb9e7fc2ab899cd7d652d5afd30fab818323208 /ffmpeg.h
parentcb884f8d7e3b55cddf8a4568bddb1e5f5f86b811 (diff)
downloadffmpeg-76e13bdeaabc7ec49322b3a118dc4805153e0401.tar.gz
ffmpeg: restructure sending EOF to filters
Be more careful when an input stream encounters EOF when its filtergraph has not been configured yet. The current code would immediately mark the corresponding output streams as finished, while there may still be buffered frames waiting for frames to appear on other filtergraph inputs. This should fix the random FATE failures for complex filtergraph tests after a3a0230a9870b9018dc7415ae5872784d524cfe5 This merges Libav commit 94ebf55. It was previously skipped. This is the last filter init related Libav commit that was skipped, so this also removes the commits from doc/libav-merge.txt. Signed-off-by: wm4 <nfxjfg@googlemail.com>
Diffstat (limited to 'ffmpeg.h')
-rw-r--r--ffmpeg.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.h b/ffmpeg.h
index 56e35ebb9c..5d20d453eb 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -248,6 +248,8 @@ typedef struct InputFilter {
uint64_t channel_layout;
AVBufferRef *hw_frames_ctx;
+
+ int eof;
} InputFilter;
typedef struct OutputFilter {