Merge commit '456ffec35d55288d589aa1901919e038c3427f30'

[ffmpeg] / libavformat / seek.c

diff --git a/libavformat/seek.c b/libavformat/seek.c
index 2368b5e5b91e56fc4f3d297953c0b9384d57aaa9..967f282d5191837412d48e22949624333fb119d5 100644 (file)
--- a/libavformat/seek.c
+++ b/libavformat/seek.c
@@ -470,15 +470,14 @@ void ff_restore_parser_state(AVFormatContext *s, AVParserState *state)
         st->probe_packets = ss->probe_packets;
     }
 
-    av_free(state->stream_states);
-    av_free(state);
+    av_freep(&state->stream_states);
+    av_freep(&state);
 }
 
 static void free_packet_list(AVPacketList *pktl)
 {
-    AVPacketList *cur;
     while (pktl) {
-        cur = pktl;
+        AVPacketList *cur = pktl;
         pktl = cur->next;
         av_free_packet(&cur->pkt);
         av_free(cur);
@@ -503,6 +502,6 @@ void ff_free_parser_state(AVFormatContext *s, AVParserState *state)
     free_packet_list(state->parse_queue);
     free_packet_list(state->raw_packet_buffer);
 
-    av_free(state->stream_states);
-    av_free(state);
+    av_freep(&state->stream_states);
+    av_freep(&state);
 }