Merge commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894'

[ffmpeg] / libavformat / oggparsecelt.c

diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index 6d567f988a307a7e0cd01c0cd5e67b3e1b38b98d..9c438a096ae3d82a2f5580646a54a99f313b28d4 100644 (file)
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -65,9 +65,14 @@ static int celt_header(AVFormatContext *s, int idx)
         st->codecpar->channels       = nb_channels;
         if (sample_rate)
             avpriv_set_pts_info(st, 64, 1, sample_rate);
-        priv->extra_headers_left  = 1 + extra_headers;
-        av_free(os->private);
+
+        if (os->private) {
+            av_free(priv);
+            priv = os->private;
+        }
         os->private = priv;
+        priv->extra_headers_left  = 1 + extra_headers;
+
         AV_WL32(st->codecpar->extradata + 0, overlap);
         AV_WL32(st->codecpar->extradata + 4, version);
         return 1;