diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 10:41:32 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 10:41:32 +0300 |
commit | 7dae3461c0bbd15e0765f29c33d2eb40566b9562 (patch) | |
tree | f559ab77f7404a725a0ba84a85613ae29483e36a /ffmpeg.c | |
parent | 4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9 (diff) | |
parent | 63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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)); |