diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:25:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-25 00:25:12 +0100 |
| commit | fa80b76b110c663809671f7254bc07513710c061 (patch) | |
| tree | 8e5de25c31794db57407a8367a84f7207342631b /libavformat/rtpdec_mpegts.c | |
| parent | 64f58d20b2008bd2c633beef3c21331dfff0d0e5 (diff) | |
| parent | bb4a310bb85f43e62240145a656b1e5285b14239 (diff) | |
Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'
* commit 'bb4a310bb85f43e62240145a656b1e5285b14239':
rtpdec: Don't free the payload context in the .free function
Conflicts:
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_mpegts.c
libavformat/rtpdec_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpegts.c')
| -rw-r--r-- | libavformat/rtpdec_mpegts.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c index ae17f4ec0f..c0c07fd0f8 100644 --- a/libavformat/rtpdec_mpegts.c +++ b/libavformat/rtpdec_mpegts.c @@ -36,7 +36,6 @@ static void mpegts_free_context(PayloadContext *data) return; if (data->ts) avpriv_mpegts_parse_close(data->ts); - av_free(data); } static av_cold int mpegts_init(AVFormatContext *ctx, int st_index, |