Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / xmv.c

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 596da5fb63afc0d0506650db509952b0169297fb..5fcc540169e802ff033667e4676792b56ade11f1 100644 (file)
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -304,7 +304,7 @@ static int xmv_process_packet_header(AVFormatContext *s)
     xmv->current_stream = 0;
     if (!xmv->video.frame_count) {
         xmv->video.frame_count = 1;
-        xmv->current_stream    = 1;
+        xmv->current_stream    = xmv->stream_count > 1;
     }
 
     /* Packet audio header */
@@ -546,7 +546,7 @@ static int xmv_read_close(AVFormatContext *s)
 {
     XMVDemuxContext *xmv = s->priv_data;
 
-    av_free(xmv->audio);
+    av_freep(&xmv->audio);
 
     return 0;
 }