Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / id3v2.c

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 9ee327169a10e10652dc3bbac1129f53defe6929..250281c357f266e80dc9f7eba68d3ceab72a8f8e 100644 (file)
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -437,7 +437,7 @@ static void ff_id3v2_parse(AVFormatContext *s, int len, uint8_t version, uint8_t
     AVIOContext *pbx;
     unsigned char *buffer = NULL;
     int buffer_size = 0;
-    const ID3v2EMFunc *extra_func;
+    const ID3v2EMFunc *extra_func = NULL;
     unsigned char *compressed_buffer = NULL;
     int compressed_buffer_size = 0;