aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-03-09 10:54:00 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-10 07:40:11 +0100
commitdc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56 (patch)
tree3fe608bb774647657552770254b9c007d7cff89c /avconv.c
parent93f7948136fcda8ddbbc44a6c24418f11ca829b8 (diff)
downloadffmpeg-dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56.tar.gz
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.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index 8e76863bec..30c1ea8829 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1507,7 +1507,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
"%s hwaccel requested for input stream #%d:%d, "
"but cannot be initialized.\n", hwaccel->name,
ist->file_index, ist->st->index);
- exit_program(1);
+ return AV_PIX_FMT_NONE;
}
continue;
}