summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc_mpegts.c
Commit message (Collapse)AuthorAge
* Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'Michael Niedermayer2015-03-10
|\ | | | | | | | | | | | | | | * commit 'cf402d6fa88acd647cdff993429583bec8a34fdc': rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeeded Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Set chain->rtp_ctx only after avformat_write_header succeededMartin Storsjö2015-03-10
| | | | | | | | | | | | | | | | | | | | | | | | By making sure we at each time only have one pointer set, either a local variable or one in the context, we avoid potential double frees in the cleanup routines. If chain->rtp_ctx is set, it is closed by calling avformat_write_trailer, but that shouldn't be called unless avformat_write_header succeeded. This issue was pointed out by Andreas Cadhalpun. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c83dd2d2a458075a58895c384372f57c1ec26276'Michael Niedermayer2015-03-10
|\| | | | | | | | | | | | | | | * commit 'c83dd2d2a458075a58895c384372f57c1ec26276': rtpenc_mpegts: Free the right ->pb in the error path in the init function Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Free the right ->pb in the error path in the init functionMartin Storsjö2015-03-10
| | | | | | | | | | | | This fixes a typo from 8e32b1f096. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a': libavformat: Use ffio_free_dyn_buf where applicable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Use ffio_free_dyn_buf where applicableMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fc308b30bb24e623fed042ec78b10803b2362a18'Michael Niedermayer2014-12-20
|\| | | | | | | | | | | | | * commit 'fc308b30bb24e623fed042ec78b10803b2362a18': rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output buffer exists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc_mpegts: Call write_trailer for the mpegts muxer even if no output ↵Martin Storsjö2014-12-19
| | | | | | | | | | | | | | | | | | | | buffer exists Since the mpegts muxer now can handle being called with a NULL AVIOContext, we don't need to try to allocate one before calling write_trailer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'Michael Niedermayer2014-12-19
|/ | | | | | | | | | | * commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a': libavformat: Add a muxer wrapping mpegts encoding into RTP Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* libavformat: Add a muxer wrapping mpegts encoding into RTPMartin Storsjö2014-12-18
Since this structurally is quite different from normal RTP (multiple streams are muxed into one single mpegts stream, which is packetized into one single RTP session), it is kept as a separate muxer. Since this structurally also behaves differently than normal RTP, all of the other muxers that do chained RTP muxing (rtsp, sap, mp4) would need to be updated similarly to handle this - in particular, creating one single rtp_mpegts muxer for the whole presentation instead of one rtp muxer per stream. Signed-off-by: Martin Storsjö <martin@martin.st>