[SCM] libav/experimental: Read match_time_delta in the framecode table.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:14:05 UTC 2013


The following commit has been merged in the experimental branch:
commit 6cb4b28fea4ea1b2142536f4521916245f5663ff
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Feb 13 20:13:29 2008 +0000

    Read match_time_delta in the framecode table.
    
    Originally committed as revision 11930 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index b637bb4..b114e40 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -185,6 +185,7 @@ static int decode_main_header(NUTContext *nut){
     uint64_t tmp, end;
     unsigned int stream_count;
     int i, j, tmp_stream, tmp_mul, tmp_pts, tmp_size, count, tmp_res;
+    int64_t tmp_match;
 
     end= get_packetheader(nut, bc, 1, MAIN_STARTCODE);
     end += url_ftell(bc);
@@ -212,6 +213,7 @@ static int decode_main_header(NUTContext *nut){
     tmp_pts=0;
     tmp_mul=1;
     tmp_stream=0;
+    tmp_match= 1-(1LL<<62);
     for(i=0; i<256;){
         int tmp_flags = ff_get_v(bc);
         int tmp_fields= ff_get_v(bc);
@@ -224,8 +226,9 @@ static int decode_main_header(NUTContext *nut){
         else             tmp_res   = 0;
         if(tmp_fields>5) count     = ff_get_v(bc);
         else             count     = tmp_mul - tmp_size;
+        if(tmp_fields>6) tmp_match = get_s(bc);
 
-        while(tmp_fields-- > 6)
+        while(tmp_fields-- > 7)
            ff_get_v(bc);
 
         if(count == 0 || i+count > 256){

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list