eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-04 13:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg

Browse Source 
* '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>
This commit is contained in:
Michael Niedermayer
2012-05-17 16:51:59 +02:00
parent b13d39bd81 5dbd66395a
commit dc2e051c4f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@@ -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,