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:
089fac7
)
avconv: initialize hwaccel_pix_fmt
author
Anton Khirnov
<anton@khirnov.net>
Sat, 23 Nov 2013 13:07:48 +0000
(14:07 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 3 Dec 2013 17:11:27 +0000
(18:11 +0100)
Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is
used, but hwaccel init fails.
avconv_opt.c
patch
|
blob
|
history
diff --git
a/avconv_opt.c
b/avconv_opt.c
index
da8c6e7
..
d62d11f
100644
(file)
--- a/
avconv_opt.c
+++ b/
avconv_opt.c
@@
-528,6
+528,7
@@
static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
if (!ist->hwaccel_device)
exit_program(1);
}
+ ist->hwaccel_pix_fmt = AV_PIX_FMT_NONE;
break;
case AVMEDIA_TYPE_AUDIO: