From dc7536ca3d2dbe47f40cc0fcd0fc2555a84d5f56 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 9 Mar 2015 10:54:00 +0100
Subject: 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.
---
 avconv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'avconv.c')

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;
         }
-- 
cgit v1.2.3