OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
93f7948
)
avconv: do not abort immediately if initializing hwaccel fails
author
Anton Khirnov
<anton@khirnov.net>
Mon, 9 Mar 2015 09:54:00 +0000
(10:54 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 10 Mar 2015 06:40:11 +0000
(07:40 +0100)
exit_program() will try to free the decoders, which is not a good idea
from within get_format().
Return an error instead.
avconv.c
patch
|
blob
|
history
diff --git
a/avconv.c
b/avconv.c
index
8e76863
..
30c1ea8
100644
(file)
--- 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;
}