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/rtsp.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/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 79212c0af5..32ff18ec03 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -732,8 +732,7 @@ void ff_rtsp_close_streams(AVFormatContext *s) if (rtsp_st->dynamic_handler->free) rtsp_st->dynamic_handler->free( rtsp_st->dynamic_protocol_context); - else - av_free(rtsp_st->dynamic_protocol_context); + av_free(rtsp_st->dynamic_protocol_context); } for (j = 0; j < rtsp_st->nb_include_source_addrs; j++) av_freep(&rtsp_st->include_source_addrs[j]); |