Merge commit 'ff300e435e5337b03dc7a8f1c0be6c9937059c1e'

[ffmpeg] / ffmpeg_opt.c

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index dc70c8b6a56976cc5f059d60b1e8d7fbed87814e..e6ac3ee8e73c466313b09e8d7b96fab7e73267b4 100644 (file)
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -653,6 +653,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: