[FFmpeg-cvslog] lavf/gif: avoid forward declaration.
Clément Bœsch
git at videolan.org
Fri Apr 19 12:11:25 CEST 2013
ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Fri Apr 19 12:11:10 2013 +0200| [6189ff3679ab479ebfdafef160ed59cc631e445a] | committer: Clément Bœsch
lavf/gif: avoid forward declaration.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6189ff3679ab479ebfdafef160ed59cc631e445a
---
libavformat/gif.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/libavformat/gif.c b/libavformat/gif.c
index ef1ea75..594eb6b 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;
More information about the ffmpeg-cvslog
mailing list