github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'bb4a310bb85f43e62240145a656b1e5285b14239'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2015-02-25 00:25:12 +01:00
parent 64f58d20b2 bb4a310bb8
commit fa80b76b11
17 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/rtpdec_dv.c
View File

@@ -42,7 +42,6 @@ static void dv_free_dyn_buffer(AVIOContext **dyn_buf)
static av_cold void dv_free_context(PayloadContext *data)
{
dv_free_dyn_buffer(&data->buf);
av_free(data);
}
static av_cold int dv_sdp_parse_fmtp_config(AVFormatContext *s,