[SCM] libav/experimental: h264 complete frames parsing support

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:49 UTC 2013


The following commit has been merged in the experimental branch:
commit 1153be3be15f0eccbb5055839185c5bf2425bd79
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed Mar 14 11:12:02 2007 +0000

    h264 complete frames parsing support
    
    Originally committed as revision 8398 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 10beead..70ec5d3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -8048,6 +8048,9 @@ static int h264_parse(AVCodecParserContext *s,
     ParseContext *pc = &h->s.parse_context;
     int next;
 
+    if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
+        next= buf_size;
+    }else{
     next= find_frame_end(h, buf, buf_size);
 
     if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
@@ -8059,6 +8062,7 @@ static int h264_parse(AVCodecParserContext *s,
     if(next<0){
         find_frame_end(h, &pc->buffer[pc->last_index + next], -next); //update state
     }
+    }
 
     *poutbuf = (uint8_t *)buf;
     *poutbuf_size = buf_size;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list