From 6189ff3679ab479ebfdafef160ed59cc631e445a Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Fri, 19 Apr 2013 12:11:10 +0200 Subject: lavf/gif: avoid forward declaration. --- libavformat/gif.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'libavformat/gif.c') diff --git a/libavformat/gif.c b/libavformat/gif.c index ef1ea7582d..594eb6b1d7 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -104,22 +104,6 @@ static int gif_write_header(AVFormatContext *s) return 0; } -/* TODO: move below */ -static int flush_packet(AVFormatContext *s, AVPacket *pkt); - -static int gif_write_packet(AVFormatContext *s, AVPacket *pkt) -{ - GIFContext *gif = s->priv_data; - - if (!gif->prev_pkt) { - gif->prev_pkt = av_malloc(sizeof(*gif->prev_pkt)); - if (!gif->prev_pkt) - return AVERROR(ENOMEM); - return av_copy_packet(gif->prev_pkt, pkt); - } - return flush_packet(s, pkt); -} - static int flush_packet(AVFormatContext *s, AVPacket *new) { GIFContext *gif = s->priv_data; @@ -174,6 +158,19 @@ static int flush_packet(AVFormatContext *s, AVPacket *new) return 0; } +static int gif_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + GIFContext *gif = s->priv_data; + + if (!gif->prev_pkt) { + gif->prev_pkt = av_malloc(sizeof(*gif->prev_pkt)); + if (!gif->prev_pkt) + return AVERROR(ENOMEM); + return av_copy_packet(gif->prev_pkt, pkt); + } + return flush_packet(s, pkt); +} + static int gif_write_trailer(AVFormatContext *s) { GIFContext *gif = s->priv_data; -- cgit v1.2.3