[FFmpeg-cvslog] lavf/gif: merge gif_write_{packet,video}.

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Apr 18 13:19:16 2013 +0200| [01367b0fca0c257c975c1a23dcd64ca717571eb0] | committer: Clément Bœsch

lavf/gif: merge gif_write_{packet,video}.

Avoid a pointless split.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01367b0fca0c257c975c1a23dcd64ca717571eb0
---

 libavformat/gif.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavformat/gif.c b/libavformat/gif.c
index 9f5fc4c..6968156 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -99,9 +99,9 @@ static int gif_write_header(AVFormatContext *s)
     return 0;
 }
 
-static int gif_write_video(AVFormatContext *s, AVCodecContext *enc,
-                           const uint8_t *buf, int size)
+static int gif_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
+    AVCodecContext *enc = s->streams[pkt->stream_index]->codec;
     AVIOContext *pb = s->pb;
     int jiffies;
 
@@ -123,17 +123,11 @@ static int gif_write_video(AVFormatContext *s, AVCodecContext *enc,
     avio_w8(pb, 0x1f); /* transparent color index */
     avio_w8(pb, 0x00);
 
-    avio_write(pb, buf, size);
+    avio_write(pb, pkt->data, pkt->size);
 
     return 0;
 }
 
-static int gif_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    AVCodecContext *codec = s->streams[pkt->stream_index]->codec;
-    return gif_write_video(s, codec, pkt->data, pkt->size);
-}
-
 static int gif_write_trailer(AVFormatContext *s)
 {
     AVIOContext *pb = s->pb;