diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:55:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:55:20 +0100 |
| commit | 3804d73e46517a7db8464f5affd49b9406dc91ba (patch) | |
| tree | 5ebac75e43d9b69bfe1bfba880a60caecb642830 /libavformat/rtpdec_h264.c | |
| parent | 48e3cd4fcd49cd7663f56611e20abb5a860caeaa (diff) | |
| parent | 5d8cae45737bed6239bd6b6e0698802dbe1463c8 (diff) | |
Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'
* commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8':
rtpdec: Get rid of all trivial .alloc/.free functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_h264.c')
| -rw-r--r-- | libavformat/rtpdec_h264.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 5764711b14..798c043afa 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -342,11 +342,6 @@ static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data, return result; } -static PayloadContext *h264_new_context(void) -{ - return av_mallocz(sizeof(PayloadContext)); -} - static void h264_free_context(PayloadContext *data) { #ifdef DEBUG @@ -408,8 +403,8 @@ RTPDynamicProtocolHandler ff_h264_dynamic_handler = { .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_H264, .need_parsing = AVSTREAM_PARSE_FULL, + .priv_data_size = sizeof(PayloadContext), .parse_sdp_a_line = parse_h264_sdp_line, - .alloc = h264_new_context, .free = h264_free_context, .parse_packet = h264_handle_packet, }; |