* commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2':
avconv: Simplify poll_filters() return value check
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
... | ... |
@@ -4126,16 +4126,12 @@ static int transcode(void) |
4126 | 4126 |
} |
4127 | 4127 |
|
4128 | 4128 |
ret = transcode_step(); |
4129 |
- if (ret < 0) { |
|
4130 |
- if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) { |
|
4131 |
- continue; |
|
4132 |
- } else { |
|
4133 |
- char errbuf[128]; |
|
4134 |
- av_strerror(ret, errbuf, sizeof(errbuf)); |
|
4129 |
+ if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) { |
|
4130 |
+ char errbuf[128]; |
|
4131 |
+ av_strerror(ret, errbuf, sizeof(errbuf)); |
|
4135 | 4132 |
|
4136 |
- av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", errbuf); |
|
4137 |
- break; |
|
4138 |
- } |
|
4133 |
+ av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", errbuf); |
|
4134 |
+ break; |
|
4139 | 4135 |
} |
4140 | 4136 |
|
4141 | 4137 |
/* dump report by using the output first video and audio streams */ |