Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'
* commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2': avconv: Drop an impossible check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
7dae3461c0
2
ffmpeg.c
2
ffmpeg.c
@ -4126,7 +4126,7 @@ static int transcode(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ret = transcode_step();
|
ret = transcode_step();
|
||||||
if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) {
|
if (ret < 0 && ret != AVERROR_EOF) {
|
||||||
char errbuf[128];
|
char errbuf[128];
|
||||||
av_strerror(ret, errbuf, sizeof(errbuf));
|
av_strerror(ret, errbuf, sizeof(errbuf));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user