summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-17 16:51:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-17 16:55:01 +0200
commitdc2e051c4f1c03f952b86e6741b5cf22e78b86f8 (patch)
tree763aefc9e4c4bbb970ac096c4641422d04258c84 /ffmpeg.c
parentb13d39bd812309aad7d912b3c55da8d16dd3efe8 (diff)
parent5dbd66395acc4ea85a3dd311f93f988a1c6021e8 (diff)
Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg
* 'audio-filters' of https://github.com/ubitux/FFmpeg: lavfi/pan: add supported sample rates to avoid a crash. ffmpeg: do not warn when expecting EOF from lavfi. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index af80d53fd9..b197fa15c3 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1964,7 +1964,7 @@ static int poll_filters(void)
AV_BUFFERSINK_FLAG_NO_REQUEST);
#endif
if (ret < 0) {
- if (ret != AVERROR(EAGAIN)) {
+ if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
char buf[256];
av_strerror(ret, buf, sizeof(buf));
av_log(NULL, AV_LOG_WARNING,