Commit dc7536ca authored by Anton Khirnov's avatar Anton Khirnov

avconv: do not abort immediately if initializing hwaccel fails

exit_program() will try to free the decoders, which is not a good idea
from within get_format().
Return an error instead.
parent 93f79481
...@@ -1507,7 +1507,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat ...@@ -1507,7 +1507,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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment