basic type mechanism working

1 files changed, 8 insertions, 6 deletions

diff --git a/ffmpeg/libavformat/rtpenc_chain.c b/ffmpeg/libavformat/rtpenc_chain.c
index 70d68ce..dea1f70 100644
--- a/ffmpeg/libavformat/rtpenc_chain.c
+++ b/ffmpeg/libavformat/rtpenc_chain.c
@@ -22,7 +22,6 @@
 #include "avformat.h"
 #include "avio_internal.h"
 #include "rtpenc_chain.h"
-#include "avio_internal.h"
 #include "rtp.h"
 #include "libavutil/opt.h"
 
@@ -78,16 +77,19 @@ int ff_rtp_chain_mux_open(AVFormatContext **out, AVFormatContext *s,
     avcodec_copy_context(rtpctx->streams[0]->codec, st->codec);
 
     if (handle) {
-        ffio_fdopen(&rtpctx->pb, handle);
+        ret = ffio_fdopen(&rtpctx->pb, handle);
+        if (ret < 0)
+            ffurl_close(handle);
     } else
-        ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
-    ret = avformat_write_header(rtpctx, &opts);
+        ret = ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
+    if (!ret)
+        ret = avformat_write_header(rtpctx, &opts);
     av_dict_free(&opts);
 
     if (ret) {
-        if (handle) {
+        if (handle && rtpctx->pb) {
             avio_close(rtpctx->pb);
-        } else {
+        } else if (rtpctx->pb) {
             uint8_t *ptr;
             avio_close_dyn_buf(rtpctx->pb, &ptr);
             av_free(ptr);