← Back to branch summary

~ubuntu-branches/ubuntu/saucy/x264/saucy-updates

« back to all changes in this revision

Viewing changes to output/matroska.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2010-07-04 16:23:51 UTC
  • mto: (12.1.1 sid) (1.3.1)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: james.westby@ubuntu.com-20100704162351-4r9pyu2l13du91l5
Tags: upstream-0.98.1653+git88b90d9
Import upstream version 0.98.1653+git88b90d9

Show diffs side-by-side

added added

removed removed

Lines of Context:
output/matroska.c
30
30
    int64_t frame_duration;
31
31
 
32
32
    char b_writing_frame;
33
 
    int i_timebase_num;
34
 
    int i_timebase_den;
 
33
    uint32_t i_timebase_num;
 
34
    uint32_t i_timebase_den;
35
35
 
36
36
} mkv_hnd_t;
37
37
 
107
107
{
108
108
    mkv_hnd_t *p_mkv = handle;
109
109
 
110
 
    int sei_size = p_nal[0].i_payload;
111
 
    int sps_size = p_nal[1].i_payload - 4;
112
 
    int pps_size = p_nal[2].i_payload - 4;
 
110
    int sps_size = p_nal[0].i_payload - 4;
 
111
    int pps_size = p_nal[1].i_payload - 4;
 
112
    int sei_size = p_nal[2].i_payload;
113
113
 
114
 
    uint8_t *sei = p_nal[0].p_payload;
115
 
    uint8_t *sps = p_nal[1].p_payload + 4;
116
 
    uint8_t *pps = p_nal[2].p_payload + 4;
 
114
    uint8_t *sps = p_nal[0].p_payload + 4;
 
115
    uint8_t *pps = p_nal[1].p_payload + 4;
 
116
    uint8_t *sei = p_nal[2].p_payload;
117
117
 
118
118
    int ret;
119
119
    uint8_t *avcC;
150
150
                          avcC, avcC_len, p_mkv->frame_duration, 50000,
151
151
                          p_mkv->width, p_mkv->height,
152
152
                          p_mkv->d_width, p_mkv->d_height );
 
153
    if( ret < 0 )
 
154
        return ret;
153
155
 
154
156
    free( avcC );
155
157