Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'

[ffmpeg] / libavcodec / dxva2_h264.c

diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index fe252bbae8ca7100596c78288ee0c022a6b50486..99b80ba3731606b6c6a1a72b51027a83d07a7c54 100644 (file)
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -298,9 +298,9 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
     const H264Picture *current_picture = h->cur_pic_ptr;
     struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
     DXVA_Slice_H264_Short *slice = NULL;
-    void     *dxva_data_ptr;
+    void     *dxva_data_ptr = NULL;
     uint8_t  *dxva_data, *current, *end;
-    unsigned dxva_size;
+    unsigned dxva_size = 0;
     void     *slice_data;
     unsigned slice_size;
     unsigned padding;