From 7e7ff4b0ea745a60437b9a2641044761bd2ca002 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 13 Jun 2014 02:02:30 +0200 Subject: demux: simplify packet resizing Actually we don't need to resize packets; we just need to make them shorter. --- demux/demux.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'demux/demux.c') diff --git a/demux/demux.c b/demux/demux.c index b9236832ce..acdee69d4b 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -167,21 +167,11 @@ struct demux_packet *new_demux_packet_from(void *data, size_t len) return dp; } -void resize_demux_packet(struct demux_packet *dp, size_t len) +void demux_packet_shorten(struct demux_packet *dp, size_t len) { - if (len > 1000000000) { - fprintf(stderr, "Attempt to realloc demux packet over 1 GB!\n"); - abort(); - } - assert(dp->allocation); - dp->buffer = realloc(dp->buffer, len + FF_INPUT_BUFFER_PADDING_SIZE); - if (!dp->buffer) { - fprintf(stderr, "Memory allocation failure!\n"); - abort(); - } - memset(dp->buffer + len, 0, FF_INPUT_BUFFER_PADDING_SIZE); + assert(len <= dp->len); dp->len = len; - dp->allocation = dp->buffer; + memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE); } void free_demux_packet(struct demux_packet *dp) -- cgit v1.2.3