Revision e731b8d8 libavformat/matroskadec.c

View differences:

libavformat/matroskadec.c
31 31
#include <stdio.h>
32 32
#include "avformat.h"
33 33
#include "internal.h"
34
#include "avio_internal.h"
34 35
/* For ff_codec_get_id(). */
35 36
#include "riff.h"
36 37
#include "isom.h"
......
698 699
                                 uint8_t *data, uint32_t size, uint64_t *num)
699 700
{
700 701
    AVIOContext pb;
701
    init_put_byte(&pb, data, size, 0, NULL, NULL, NULL, NULL);
702
    ffio_init_context(&pb, data, size, 0, NULL, NULL, NULL, NULL);
702 703
    return ebml_read_num(matroska, &pb, FFMIN(size, 8), num);
703 704
}
704 705

  
......
1328 1329
        } else if (!strcmp(track->codec_id, "A_MS/ACM")
1329 1330
                   && track->codec_priv.size >= 14
1330 1331
                   && track->codec_priv.data != NULL) {
1331
            init_put_byte(&b, track->codec_priv.data, track->codec_priv.size,
1332
            ffio_init_context(&b, track->codec_priv.data, track->codec_priv.size,
1332 1333
                          URL_RDONLY, NULL, NULL, NULL, NULL);
1333 1334
            ff_get_wav_header(&b, st->codec, track->codec_priv.size);
1334 1335
            codec_id = st->codec->codec_id;
......
1373 1374
            extradata = av_mallocz(extradata_size);
1374 1375
            if (extradata == NULL)
1375 1376
                return AVERROR(ENOMEM);
1376
            init_put_byte(&b, extradata, extradata_size, 1,
1377
            ffio_init_context(&b, extradata, extradata_size, 1,
1377 1378
                          NULL, NULL, NULL, NULL);
1378 1379
            put_buffer(&b, "TTA1", 4);
1379 1380
            put_le16(&b, 1);
......
1390 1391
        } else if (codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK ||
1391 1392
                   codec_id == CODEC_ID_ATRAC3 || codec_id == CODEC_ID_SIPR) {
1392 1393
            int flavor;
1393
            init_put_byte(&b, track->codec_priv.data,track->codec_priv.size,
1394
            ffio_init_context(&b, track->codec_priv.data,track->codec_priv.size,
1394 1395
                          0, NULL, NULL, NULL, NULL);
1395 1396
            url_fskip(&b, 22);
1396 1397
            flavor                       = get_be16(&b);

Also available in: Unified diff