Ticket #4929: nae.patch

ffplay.c

@@ -1192 +1192 @@
 
 static void stream_close(VideoState *is)
 {
+    avformat_preclose_input(&is->ic);
+  
     /* XXX: use a special url_shutdown call to abort parse cleanly */
     is->abort_request = 1;
     SDL_WaitThread(is->read_tid, NULL);

libavformat/avformat.h

@@ -693 +693 @@
     int (*read_packet)(struct AVFormatContext *, AVPacket *pkt);
 
     /**
+     * The stream is going to be closed. The AVFormatContext and AVStreams are not
+     * freed by this function
+     */
+    int (*read_preclose)(struct AVFormatContext *);
+  
+    /**
      * Close the stream. The AVFormatContext and AVStreams are not
      * freed by this function
      */
@@ -2231 +2237 @@
 int av_read_pause(AVFormatContext *s);
 
 /**
+ * Call before closing input AVFormatContext.
+ */
+void avformat_preclose_input(AVFormatContext **s);
+/**
+ * @}
+ */
+
+/**
  * Close an opened input AVFormatContext. Free it and all its contents
  * and set *s to NULL.
  */

libavformat/rtspdec.c

@@ -53 +53 @@
     { 0,                          "NULL"                             }
 };
 
-static int rtsp_read_close(AVFormatContext *s)
+static int rtsp_read_preclose(AVFormatContext *s)
 {
     RTSPState *rt = s->priv_data;
 
-    if (!(rt->rtsp_flags & RTSP_FLAG_LISTEN))
-        ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
+    if (!(rt->rtsp_flags & RTSP_FLAG_LISTEN)) {
+      ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL);
+    }
+    return 0;
+}
 
+static int rtsp_read_close(AVFormatContext *s)
+{
+    RTSPState *rt = s->priv_data;
+        
     ff_rtsp_close_streams(s);
     ff_rtsp_close_connections(s);
     ff_network_close();
@@ -551 +558 @@
         ff_rtsp_send_cmd(s, "PLAY", rt->control_uri, cmd, reply, NULL);
         if (reply->status_code != RTSP_STATUS_OK) {
             return ff_rtsp_averror(reply->status_code, -1);
-        }
+        }       
         if (rt->transport == RTSP_TRANSPORT_RTP &&
             reply->range_start != AV_NOPTS_VALUE) {
             for (i = 0; i < rt->nb_rtsp_streams; i++) {
@@ -616 +623 @@
     }
     if (!content)
         return AVERROR_INVALIDDATA;
-
+    
     av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", content);
     /* now we got the SDP description, we parse it */
     ret = ff_sdp_parse(s, (const char *)content);
@@ -966 +973 @@
     .read_probe     = rtsp_probe,
     .read_header    = rtsp_read_header,
     .read_packet    = rtsp_read_packet,
+    .read_preclose  = rtsp_read_preclose,
     .read_close     = rtsp_read_close,
     .read_seek      = rtsp_read_seek,
     .flags          = AVFMT_NOFILE,

libavformat/utils.c

@@ -3707 +3707 @@
     av_free(s);
 }
 
+void avformat_preclose_input(AVFormatContext **ps)
+{
+    AVFormatContext *s;
+
+    if (!ps || !*ps)
+        return;
+
+    s  = *ps;
+    
+    if (s->iformat)
+        if (s->iformat->read_preclose)
+            s->iformat->read_preclose(s);
+}
+
 void avformat_close_input(AVFormatContext **ps)
 {
     AVFormatContext *s;