aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-19 08:41:32 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-19 08:41:32 +0100
commit7dae3461c0bbd15e0765f29c33d2eb40566b9562 (patch)
treef559ab77f7404a725a0ba84a85613ae29483e36a /ffmpeg.c
parent4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9 (diff)
parent63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2 (diff)
downloadffmpeg-7dae3461c0bbd15e0765f29c33d2eb40566b9562.tar.gz
Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'
* commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2': avconv: Drop an impossible check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 5d014128ad..97aca10518 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4126,7 +4126,7 @@ static int transcode(void)
}
ret = transcode_step();
- if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) {
+ if (ret < 0 && ret != AVERROR_EOF) {
char errbuf[128];
av_strerror(ret, errbuf, sizeof(errbuf));