generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

Browse Source 
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
  rtpdec: Get rid of all trivial .alloc/.free functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-24 22:55:14 +01:00
parent 48e3cd4fcd 5d8cae4573
commit 3804d73e46
18 changed files with 19 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtpdec_xiph.c
View File

@@ -49,11 +49,6 @@ struct PayloadContext {
int split_pkts;
};
static PayloadContext *xiph_new_context(void)
{
return av_mallocz(sizeof(PayloadContext));
}
static inline void free_fragment(PayloadContext * data)
{
if (data->fragment) {
@@ -385,8 +380,8 @@ RTPDynamicProtocolHandler ff_theora_dynamic_handler = {
.enc_name = "theora",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_THEORA,
.priv_data_size = sizeof(PayloadContext),
.parse_sdp_a_line = xiph_parse_sdp_line,
.alloc = xiph_new_context,
.free = xiph_free_context,
.parse_packet = xiph_handle_packet,
};
@@ -396,8 +391,8 @@ RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_VORBIS,
.need_parsing = AVSTREAM_PARSE_HEADERS,
.priv_data_size = sizeof(PayloadContext),
.parse_sdp_a_line = xiph_parse_sdp_line,
.alloc = xiph_new_context,
.free = xiph_free_context,
.parse_packet = xiph_handle_packet,
};