Mercurial > libavformat.hg

changeset 2302:33033ec6fc6c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set the previous tag size correctly in flv files
author michael
date Sat, 04 Aug 2007 23:03:17 +0000
parents 45a6610e6a4f
children 36009df78f49
files flvenc.c
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/flvenc.c	Sat Aug 04 22:54:46 2007 +0000
+++ b/flvenc.c	Sat Aug 04 23:03:17 2007 +0000
@@ -275,10 +275,15 @@
     AVCodecContext *enc = s->streams[pkt->stream_index]->codec;
     FLVContext *flv = s->priv_data;
     int size= pkt->size;
-    int flags;
+    int flags, flags_size;
 
 //    av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size);
 
+    if(enc->codec_id == CODEC_ID_VP6 || enc->codec_id == CODEC_ID_VP6F)
+        flags_size= 2;
+    else
+        flags_size= 1;
+
     if (enc->codec_type == CODEC_TYPE_VIDEO) {
         put_byte(pb, FLV_TAG_TYPE_VIDEO);
 
@@ -298,10 +303,7 @@
         put_byte(pb, FLV_TAG_TYPE_AUDIO);
     }
 
-    if ((enc->codec_id == CODEC_ID_VP6) || (enc->codec_id == CODEC_ID_VP6F))
-        put_be24(pb,size+2); // include the extra byte needed for VP6 in flv and flags
-    else
-        put_be24(pb,size+1); // include flags
+    put_be24(pb,size + flags_size);
     put_be24(pb,pkt->pts);
     put_be32(pb,flv->reserved);
     put_byte(pb,flags);
@@ -310,7 +312,7 @@
     if (enc->codec_id == CODEC_ID_VP6F)
         put_byte(pb, enc->extradata_size ? enc->extradata[0] : 0);
     put_buffer(pb, pkt->data, size);
-    put_be32(pb,size+1+11); // previous tag size
+    put_be32(pb,size+flags_size+11); // previous tag size
     flv->duration = pkt->pts + pkt->duration;
 
     put_flush_packet(pb);