mp4: Merge read_mp4a() into read_stsd().

[paraslash.git] / mp4.h

diff --git a/mp4.h b/mp4.h
index 783de19d631d4a09bb3c364d96451003eb253d00..243b75ca369e988b84083853829ef2c24bb4d424 100644 (file)
--- a/mp4.h
+++ b/mp4.h
@@ -1,9 +1,9 @@
 struct mp4_callback {
-    ssize_t (*read)(void *user_data, void *buffer, size_t length);
-    uint32_t (*write)(void *udata, void *buffer, uint32_t length);
-    uint32_t (*seek)(void *user_data, uint64_t position);
-    uint32_t (*truncate)(void *user_data);
-    void *user_data;
+       ssize_t (*read)(void *user_data, void *buffer, size_t length);
+       ssize_t (*write)(void *user_data, void *buffer, size_t count);
+       off_t (*seek)(void *user_data, off_t offset, int whence);
+       uint32_t (*truncate)(void *user_data);
+       void *user_data;
 };
 
 struct mp4_tag {
@@ -29,7 +29,7 @@ int32_t mp4_num_samples(const struct mp4 *f);
 uint64_t mp4_get_duration(const struct mp4 *f);
 int mp4_open_meta(const struct mp4_callback *cb, struct mp4 **result);
 struct mp4_metadata *mp4_get_meta(struct mp4 *f);
-int32_t mp4_meta_update(struct mp4 *f);
+int mp4_meta_update(struct mp4 *f);
 char *mp4_meta_get_artist(const struct mp4 *f);
 char *mp4_meta_get_title(const struct mp4 *f);
 char *mp4_meta_get_date(const struct mp4 *f);