generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests 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_jpeg.c
View File

@@ -72,7 +72,6 @@ static void free_frame(PayloadContext *jpeg)
static void jpeg_free_context(PayloadContext *jpeg)
{
free_frame(jpeg);
av_free(jpeg);
}
static int jpeg_create_huffman_table(PutByteContext *p, int table_class,