Merge commit 'dc7536ca'

* commit 'dc7536ca':
  avconv: do not abort immediately if initializing hwaccel fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg.c

@@ -2360,7 +2360,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;
         }