[FFmpeg-cvslog] r17888 - trunk/libavformat/gxfenc.c

[bcoudurier]

Author: bcoudurier
Date: Sun Mar  8 23:14:26 2009
New Revision: 17888

Log:
factorize write packet

Modified:
   trunk/libavformat/gxfenc.c

Modified: trunk/libavformat/gxfenc.c
==============================================================================
--- trunk/libavformat/gxfenc.c	Sun Mar  8 23:13:48 2009	(r17887)
+++ trunk/libavformat/gxfenc.c	Sun Mar  8 23:14:26 2009	(r17888)
@@ -762,7 +762,7 @@ static int gxf_write_media_preamble(AVFo
     return 16;
 }
 
-static int gxf_write_media_packet(AVFormatContext *s, AVPacket *pkt)
+static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     GXFContext *gxf = s->priv_data;
     ByteIOContext *pb = s->pb;
@@ -782,14 +782,9 @@ static int gxf_write_media_packet(AVForm
     if (st->codec->codec_type == CODEC_TYPE_VIDEO)
         gxf->nb_fields += 2; // count fields
 
-    return updatePacketSize(pb, pos);
-}
+    put_flush_packet(pb);
 
-static int gxf_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    gxf_write_media_packet(s, pkt);
-    put_flush_packet(s->pb);
-    return 0;
+    return updatePacketSize(pb, pos);
 }
 
 static int gxf_interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *pkt, int flush)