summaryrefslogtreecommitdiff
path: root/avconv_opt.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-23 14:07:48 +0100
committerAnton Khirnov <anton@khirnov.net>2013-12-03 18:11:27 +0100
commitc255f0b001da3afa4709f5378680880b8a2dbe61 (patch)
treed6a10dd6326e6db7be1647cd474feb4645d9495f /avconv_opt.c
parent089fac77a6bf9199a5ec161e9c27850f0a680541 (diff)
avconv: initialize hwaccel_pix_fmt
Fixes an assertion failure in vdpau_get_buffer() when -hwaccel auto is used, but hwaccel init fails.
Diffstat (limited to 'avconv_opt.c')
-rw-r--r--avconv_opt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index da8c6e7574..d62d11f5e6 100644
--- 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: