| 1 | 235,236c235,247
|
|---|
| 2 | < if (mkv_d->cluster_positions[i] == position)
|
|---|
| 3 | < return;
|
|---|
| 4 | ---
|
|---|
| 5 | > {
|
|---|
| 6 | > if (mkv_d->cluster_positions[i] == position)
|
|---|
| 7 | > {
|
|---|
| 8 | > return;
|
|---|
| 9 | > }
|
|---|
| 10 | > }
|
|---|
| 11 | >
|
|---|
| 12 | >
|
|---|
| 13 | > if (!(mkv_d->num_cluster_pos & 31))
|
|---|
| 14 | > {
|
|---|
| 15 | > mkv_d->cluster_positions = realloc(mkv_d->cluster_positions,
|
|---|
| 16 | > (mkv_d->num_cluster_pos + 32) * sizeof(uint64_t));
|
|---|
| 17 | > }
|
|---|
| 18 | 238,239d248
|
|---|
| 19 | < grow_array((void **)&mkv_d->cluster_positions, mkv_d->num_cluster_pos,
|
|---|
| 20 | < sizeof(uint64_t));
|
|---|
| 21 | 240a250
|
|---|
| 22 | >
|
|---|
| 23 | 2786a2797
|
|---|
| 24 | >
|
|---|
| 25 | 2790a2802,2809
|
|---|
| 26 | > uint64_t block_duration, block_length;
|
|---|
| 27 | > int64_t block_bref, block_fref;
|
|---|
| 28 | > uint8_t *block;
|
|---|
| 29 | > int res;
|
|---|
| 30 | > uint64_t unum;
|
|---|
| 31 | > int64_t num;
|
|---|
| 32 | >
|
|---|
| 33 | >
|
|---|
| 34 | 2796,2798c2815,2821
|
|---|
| 35 | < uint64_t block_duration = 0, block_length = 0;
|
|---|
| 36 | < int64_t block_bref = 0, block_fref = 0;
|
|---|
| 37 | < uint8_t *block = NULL;
|
|---|
| 38 | ---
|
|---|
| 39 | > block_duration = 0;
|
|---|
| 40 | > block_length = 0;
|
|---|
| 41 | > block_bref = 0;
|
|---|
| 42 | > block_fref = 0;
|
|---|
| 43 | > block = NULL;
|
|---|
| 44 | >
|
|---|
| 45 | >
|
|---|
| 46 | 2815a2839
|
|---|
| 47 | > {
|
|---|
| 48 | 2827a2852
|
|---|
| 49 | > }
|
|---|
| 50 | 2831c2856,2857
|
|---|
| 51 | < int64_t num = ebml_read_int (s, &l);
|
|---|
| 52 | ---
|
|---|
| 53 | > num = ebml_read_int (s, &l);
|
|---|
| 54 | >
|
|---|
| 55 | 2843a2870,2871
|
|---|
| 56 | > {
|
|---|
| 57 | >
|
|---|
| 58 | 2845a2874
|
|---|
| 59 | > }
|
|---|
| 60 | 2847a2877,2878
|
|---|
| 61 | > {
|
|---|
| 62 | >
|
|---|
| 63 | 2850a2882,2883
|
|---|
| 64 | > }
|
|---|
| 65 | >
|
|---|
| 66 | 2852a2886
|
|---|
| 67 | >
|
|---|
| 68 | 2857c2891
|
|---|
| 69 | < int res = handle_block (demuxer, block, block_length,
|
|---|
| 70 | ---
|
|---|
| 71 | > res = handle_block (demuxer, block, block_length,
|
|---|
| 72 | 2858a2893
|
|---|
| 73 | >
|
|---|
| 74 | 2861c2896
|
|---|
| 75 | < return 0;
|
|---|
| 76 | ---
|
|---|
| 77 | > { return 0;}
|
|---|
| 78 | 2863c2898
|
|---|
| 79 | < return 1;
|
|---|
| 80 | ---
|
|---|
| 81 | > { return 1;}
|
|---|
| 82 | 2872,2873c2907,2909
|
|---|
| 83 | < uint64_t num = ebml_read_uint (s, &l);
|
|---|
| 84 | < if (num == EBML_UINT_INVALID)
|
|---|
| 85 | ---
|
|---|
| 86 | > unum = ebml_read_uint (s, &l);
|
|---|
| 87 | >
|
|---|
| 88 | > if (unum == EBML_UINT_INVALID)
|
|---|
| 89 | 2877c2913
|
|---|
| 90 | < mkv_d->first_tc = num * mkv_d->tc_scale / 1000000.0;
|
|---|
| 91 | ---
|
|---|
| 92 | > mkv_d->first_tc = unum * mkv_d->tc_scale / 1000000.0;
|
|---|
| 93 | 2880c2916
|
|---|
| 94 | < mkv_d->cluster_tc = num * mkv_d->tc_scale;
|
|---|
| 95 | ---
|
|---|
| 96 | > mkv_d->cluster_tc = unum * mkv_d->tc_scale;
|
|---|
| 97 | 2884a2921
|
|---|
| 98 | > {
|
|---|
| 99 | 2887a2925
|
|---|
| 100 | > }
|
|---|
| 101 | 2891c2929,2930
|
|---|
| 102 | < int res;
|
|---|
| 103 | ---
|
|---|
| 104 | >
|
|---|
| 105 | >
|
|---|
| 106 | 2912a2952,2953
|
|---|
| 107 | > {
|
|---|
| 108 | >
|
|---|
| 109 | 2913a2955
|
|---|
| 110 | > }
|
|---|
| 111 | 2915a2958
|
|---|
| 112 | > {
|
|---|
| 113 | 2918a2962
|
|---|
| 114 | > }
|
|---|
| 115 | 2922a2967
|
|---|
| 116 | >
|
|---|
| 117 | 2923a2969
|
|---|
| 118 | > {
|
|---|
| 119 | 2924a2971,2972
|
|---|
| 120 | > }
|
|---|
| 121 | >
|
|---|
| 122 | 2925a2974
|
|---|
| 123 | >
|
|---|
| 124 | 2926a2976
|
|---|
| 125 | >
|
|---|
| 126 | 2928a2979
|
|---|
| 127 | >
|
|---|
| 128 | 3053a3105
|
|---|
| 129 | >
|
|---|
| 130 | 3091a3144
|
|---|
| 131 | >
|
|---|
