Revision e4141433 libavformat/mov.c

View differences:

libavformat/mov.c
361 361
static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
362 362
{
363 363
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
364
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
364
    MOVStreamContext *sc = st->priv_data;
365 365
    int tag, len;
366 366

  
367 367
    /* Well, broken but suffisant for some MP4 streams */
......
447 447
static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
448 448
{
449 449
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
450
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
450
    MOVStreamContext *sc = st->priv_data;
451 451
    int version = get_byte(pb);
452 452
    int lang;
453 453

  
......
618 618
static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
619 619
{
620 620
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
621
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
621
    MOVStreamContext *sc = st->priv_data;
622 622
    unsigned int i, entries;
623 623

  
624 624
    get_byte(pb); /* version */
......
650 650
static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
651 651
{
652 652
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
653
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
653
    MOVStreamContext *sc = st->priv_data;
654 654
    int entries, frames_per_sample;
655 655
    uint32_t format;
656 656
    uint8_t codec_name[32];
......
939 939
static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
940 940
{
941 941
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
942
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
942
    MOVStreamContext *sc = st->priv_data;
943 943
    unsigned int i, entries;
944 944

  
945 945
    get_byte(pb); /* version */
......
968 968
static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
969 969
{
970 970
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
971
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
971
    MOVStreamContext *sc = st->priv_data;
972 972
    unsigned int i, entries;
973 973

  
974 974
    get_byte(pb); /* version */
......
998 998
static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
999 999
{
1000 1000
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
1001
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
1001
    MOVStreamContext *sc = st->priv_data;
1002 1002
    unsigned int i, entries, sample_size;
1003 1003

  
1004 1004
    get_byte(pb); /* version */
......
1033 1033
static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
1034 1034
{
1035 1035
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
1036
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
1036
    MOVStreamContext *sc = st->priv_data;
1037 1037
    unsigned int i, entries;
1038 1038
    int64_t duration=0;
1039 1039
    int64_t total_sample_count=0;
......
1079 1079
static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
1080 1080
{
1081 1081
    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
1082
    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
1082
    MOVStreamContext *sc = st->priv_data;
1083 1083
    unsigned int i, entries;
1084 1084

  
1085 1085
    get_byte(pb); /* version */
......
1471 1471

  
1472 1472
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
1473 1473
{
1474
    MOVContext *mov = (MOVContext *) s->priv_data;
1474
    MOVContext *mov = s->priv_data;
1475 1475
    ByteIOContext *pb = &s->pb;
1476 1476
    int i, err;
1477 1477
    MOV_atom_t atom = { 0, 0, 0 };
......
1664 1664
static int mov_read_close(AVFormatContext *s)
1665 1665
{
1666 1666
    int i;
1667
    MOVContext *mov = (MOVContext *) s->priv_data;
1667
    MOVContext *mov = s->priv_data;
1668 1668
    for(i=0; i<mov->total_streams; i++)
1669 1669
        mov_free_stream_context(mov->streams[i]);
1670 1670
    /* free color tabs */

Also available in: Unified diff