mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-25 16:52:31 +00:00
Merge commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56'
* commit 'dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56': avconv: do not abort immediately if initializing hwaccel fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
f063a0b33d
2
ffmpeg.c
2
ffmpeg.c
@ -2360,7 +2360,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
|
|||||||
"%s hwaccel requested for input stream #%d:%d, "
|
"%s hwaccel requested for input stream #%d:%d, "
|
||||||
"but cannot be initialized.\n", hwaccel->name,
|
"but cannot be initialized.\n", hwaccel->name,
|
||||||
ist->file_index, ist->st->index);
|
ist->file_index, ist->st->index);
|
||||||
exit_program(1);
|
return AV_PIX_FMT_NONE;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user