1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00

Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

* 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
18 changed files with 19 additions and 128 deletions

View File

@@ -31,11 +31,6 @@ struct PayloadContext {
uint32_t timestamp;
};
static PayloadContext *latm_new_context(void)
{
return av_mallocz(sizeof(PayloadContext));
}
static void latm_free_context(PayloadContext *data)
{
if (!data)
@@ -180,8 +175,8 @@ RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler = {
.enc_name = "MP4A-LATM",
.codec_type = AVMEDIA_TYPE_AUDIO,
.codec_id = AV_CODEC_ID_AAC,
.priv_data_size = sizeof(PayloadContext),
.parse_sdp_a_line = latm_parse_sdp_line,
.alloc = latm_new_context,
.free = latm_free_context,
.parse_packet = latm_parse_packet,
};