]> git.tue.mpg.de Git - paraslash.git/commitdiff
Merge branch 't/vorbis_dummy_header'
authorAndre Noll <maan@systemlinux.org>
Sat, 5 Mar 2011 11:53:02 +0000 (12:53 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 5 Mar 2011 11:53:02 +0000 (12:53 +0100)
1  2 
ogg_afh_common.c
vss.c

index 72fab7c14db9caeb8e5459dbead0798fb2e46c67,ad5963ebc1488ca32d6c2055ee5009fd377d4c8c..cb59d36383a104836bbff4ef59f233f464ae4743
@@@ -142,9 -145,12 +144,12 @@@ int ogg_get_file_info(char *map, size_
        ret = process_ogg_packets(&oss, afhi, ci);
        if (ret < 0)
                goto out;
+       if (!afhi)
+               goto out;
+       afhi->header_len = oss.returned;
        oss.returned = 0;
        oss.fill = numbytes;
 -      /* count ogg packages and get duration of the file */
 +      /* count ogg pages and get duration of the file */
        for (i = 0; ogg_sync_pageseek(&oss, &op) > 0; i++)
                num_frames = ogg_page_granulepos(&op);
        PARA_INFO_LOG("%d pages, %llu frames\n", i, num_frames);
diff --cc vss.c
Simple merge