aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpdec_jpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:55:14 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-24 22:55:20 +0100
commit3804d73e46517a7db8464f5affd49b9406dc91ba (patch)
tree5ebac75e43d9b69bfe1bfba880a60caecb642830 /libavformat/rtpdec_jpeg.c
parent48e3cd4fcd49cd7663f56611e20abb5a860caeaa (diff)
parent5d8cae45737bed6239bd6b6e0698802dbe1463c8 (diff)
downloadffmpeg-3804d73e46517a7db8464f5affd49b9406dc91ba.tar.gz
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_jpeg.c')
-rw-r--r--libavformat/rtpdec_jpeg.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 0f7cec82dd..447ea2f6be 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -59,11 +59,6 @@ static const uint8_t default_quantizers[128] = {
99, 99, 99, 99, 99, 99, 99, 99
};
-static PayloadContext *jpeg_new_context(void)
-{
- return av_mallocz(sizeof(PayloadContext));
-}
-
static inline void free_frame(PayloadContext *jpeg)
{
if (jpeg->frame) {
@@ -402,7 +397,7 @@ RTPDynamicProtocolHandler ff_jpeg_dynamic_handler = {
.enc_name = "JPEG",
.codec_type = AVMEDIA_TYPE_VIDEO,
.codec_id = AV_CODEC_ID_MJPEG,
- .alloc = jpeg_new_context,
+ .priv_data_size = sizeof(PayloadContext),
.free = jpeg_free_context,
.parse_packet = jpeg_parse_packet,
.static_payload_id = 26,