Revision e63a3628 libavformat/mp3dec.c

View differences:

libavformat/mp3dec.c
80 80
    MPADecodeHeader c;
81 81
    int vbrtag_size = 0;
82 82

  
83
    v = get_be32(s->pb);
83
    v = avio_rb32(s->pb);
84 84
    if(ff_mpa_check_header(v) < 0)
85 85
      return -1;
86 86

  
......
91 91

  
92 92
    /* Check for Xing / Info tag */
93 93
    url_fseek(s->pb, xing_offtbl[c.lsf == 1][c.nb_channels == 1], SEEK_CUR);
94
    v = get_be32(s->pb);
94
    v = avio_rb32(s->pb);
95 95
    if(v == MKBETAG('X', 'i', 'n', 'g') || v == MKBETAG('I', 'n', 'f', 'o')) {
96
        v = get_be32(s->pb);
96
        v = avio_rb32(s->pb);
97 97
        if(v & 0x1)
98
            frames = get_be32(s->pb);
98
            frames = avio_rb32(s->pb);
99 99
        if(v & 0x2)
100
            size = get_be32(s->pb);
100
            size = avio_rb32(s->pb);
101 101
    }
102 102

  
103 103
    /* Check for VBRI tag (always 32 bytes after end of mpegaudio header) */
104 104
    url_fseek(s->pb, base + 4 + 32, SEEK_SET);
105
    v = get_be32(s->pb);
105
    v = avio_rb32(s->pb);
106 106
    if(v == MKBETAG('V', 'B', 'R', 'I')) {
107 107
        /* Check tag version */
108
        if(get_be16(s->pb) == 1) {
108
        if(avio_rb16(s->pb) == 1) {
109 109
            /* skip delay and quality */
110 110
            url_fseek(s->pb, 4, SEEK_CUR);
111
            frames = get_be32(s->pb);
112
            size = get_be32(s->pb);
111
            frames = avio_rb32(s->pb);
112
            size = avio_rb32(s->pb);
113 113
        }
114 114
    }
115 115

  

Also available in: Unified diff