Revision b7effd4e libavformat/yop.c

View differences:

libavformat/yop.c
83 83

  
84 84
    url_fskip(pb, 6);
85 85

  
86
    frame_rate              = get_byte(pb);
87
    yop->frame_size         = get_byte(pb) * 2048;
88
    video_dec->width        = get_le16(pb);
89
    video_dec->height       = get_le16(pb);
86
    frame_rate              = avio_r8(pb);
87
    yop->frame_size         = avio_r8(pb) * 2048;
88
    video_dec->width        = avio_rl16(pb);
89
    video_dec->height       = avio_rl16(pb);
90 90

  
91 91
    video_stream->sample_aspect_ratio = (AVRational){1, 2};
92 92

  
93
    ret = get_buffer(pb, video_dec->extradata, 8);
93
    ret = avio_read(pb, video_dec->extradata, 8);
94 94
    if (ret < 8)
95 95
        return ret < 0 ? ret : AVERROR_EOF;
96 96

  
......
138 138

  
139 139
    yop->video_packet.pos = url_ftell(pb);
140 140

  
141
    ret = get_buffer(pb, yop->video_packet.data, yop->palette_size);
141
    ret = avio_read(pb, yop->video_packet.data, yop->palette_size);
142 142
    if (ret < 0) {
143 143
        goto err_out;
144 144
    }else if (ret < yop->palette_size) {
......
155 155

  
156 156
    url_fskip(pb, yop->audio_block_length - ret);
157 157

  
158
    ret = get_buffer(pb, yop->video_packet.data + yop->palette_size,
158
    ret = avio_read(pb, yop->video_packet.data + yop->palette_size,
159 159
                     actual_video_data_size);
160 160
    if (ret < 0)
161 161
        goto err_out;

Also available in: Unified diff