[FFmpeg-cvslog] ffmpeg: Don' t try and write sdp info if none of the outputs had an rtp format.
Simon Thelen
git at videolan.org
Thu Nov 12 04:07:48 CET 2015
ffmpeg | branch: release/2.7 | Simon Thelen <ffmpeg-dev at c-14.de> | Mon Nov 2 16:36:16 2015 +0100| [b9a3e0af07bc09e1c5db28bf90505e1d7a76daa6] | committer: Michael Niedermayer
ffmpeg: Don't try and write sdp info if none of the outputs had an rtp format.
Fixes a segfault when trying to write nonexistent rtp information.
Signed-off-by: Simon Thelen <ffmpeg-dev at c-14.de>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 70fb5eadc580a82c4b977a1233d70ad0041faba0)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9a3e0af07bc09e1c5db28bf90505e1d7a76daa6
---
ffmpeg.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index 8bf0aa8..b65ee71 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2370,6 +2370,9 @@ static void print_sdp(void)
}
}
+ if (!j)
+ goto fail;
+
av_sdp_create(avc, j, sdp, sizeof(sdp));
if (!sdp_filename) {
@@ -2385,6 +2388,7 @@ static void print_sdp(void)
}
}
+fail:
av_freep(&avc);
}
More information about the ffmpeg-cvslog
mailing list