Browse Source

lavf/gif: avoid forward declaration.

tags/n2.0
Clément Bœsch 13 years ago
parent
commit
6189ff3679
1 changed files with 13 additions and 16 deletions
  1. +13
    -16
      libavformat/gif.c

+ 13
- 16
libavformat/gif.c View File

@@ -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;


Loading…
Cancel
Save