Revision b7effd4e libavformat/apetag.c

View differences:

libavformat/apetag.c
38 38
    uint32_t size, flags;
39 39
    int i, c;
40 40

  
41
    size = get_le32(pb);  /* field size */
42
    flags = get_le32(pb); /* field flags */
41
    size = avio_rl32(pb);  /* field size */
42
    flags = avio_rl32(pb); /* field flags */
43 43
    for (i = 0; i < sizeof(key) - 1; i++) {
44
        c = get_byte(pb);
44
        c = avio_r8(pb);
45 45
        if (c < 0x20 || c > 0x7E)
46 46
            break;
47 47
        else
......
57 57
    value = av_malloc(size+1);
58 58
    if (!value)
59 59
        return AVERROR(ENOMEM);
60
    get_buffer(pb, value, size);
60
    avio_read(pb, value, size);
61 61
    value[size] = 0;
62 62
    av_metadata_set2(&s->metadata, key, value, AV_METADATA_DONT_STRDUP_VAL);
63 63
    return 0;
......
76 76

  
77 77
    url_fseek(pb, file_size - APE_TAG_FOOTER_BYTES, SEEK_SET);
78 78

  
79
    get_buffer(pb, buf, 8);    /* APETAGEX */
79
    avio_read(pb, buf, 8);     /* APETAGEX */
80 80
    if (strncmp(buf, "APETAGEX", 8)) {
81 81
        return;
82 82
    }
83 83

  
84
    val = get_le32(pb);        /* APE tag version */
84
    val = avio_rl32(pb);       /* APE tag version */
85 85
    if (val > APE_TAG_VERSION) {
86 86
        av_log(s, AV_LOG_ERROR, "Unsupported tag version. (>=%d)\n", APE_TAG_VERSION);
87 87
        return;
88 88
    }
89 89

  
90
    tag_bytes = get_le32(pb);  /* tag size */
90
    tag_bytes = avio_rl32(pb); /* tag size */
91 91
    if (tag_bytes - APE_TAG_FOOTER_BYTES > (1024 * 1024 * 16)) {
92 92
        av_log(s, AV_LOG_ERROR, "Tag size is way too big\n");
93 93
        return;
94 94
    }
95 95

  
96
    fields = get_le32(pb);     /* number of fields */
96
    fields = avio_rl32(pb);    /* number of fields */
97 97
    if (fields > 65536) {
98 98
        av_log(s, AV_LOG_ERROR, "Too many tag fields (%d)\n", fields);
99 99
        return;
100 100
    }
101 101

  
102
    val = get_le32(pb);        /* flags */
102
    val = avio_rl32(pb);       /* flags */
103 103
    if (val & APE_TAG_FLAG_IS_HEADER) {
104 104
        av_log(s, AV_LOG_ERROR, "APE Tag is a header\n");
105 105
        return;

Also available in: Unified diff