mp4: Use uniform names for callback and mp4 structures.

[paraslash.git] / mp4.h

diff --git a/mp4.h b/mp4.h
index 9946b0fd626bba7df4968743085477e868f46e9a..1690b0dac5961ce93407d44b5a0638d6094ebfd2 100644 (file)
--- a/mp4.h
+++ b/mp4.h
@@ -22,18 +22,18 @@ struct mp4; /* opaque */
 void mp4_set_sample_position(struct mp4 *f, int32_t track, int32_t sample);
 int32_t mp4_total_tracks(const struct mp4 *f);
 bool mp4_is_audio_track(const struct mp4 *f, int32_t track);
-struct mp4 *mp4_open_read(struct mp4_callback *f);
+struct mp4 *mp4_open_read(struct mp4_callback *cb);
 void mp4_close(struct mp4 *f);
 int32_t mp4_get_sample_size(const struct mp4 *f, int track, int sample);
 uint32_t mp4_get_sample_rate(const struct mp4 *f, int32_t track);
 uint32_t mp4_get_channel_count(const struct mp4 * f, int32_t track);
 int32_t mp4_num_samples(const struct mp4 *f, int track);
 uint64_t mp4_get_duration(const struct mp4 *f, int32_t track);
-struct mp4 *mp4_open_meta(struct mp4_callback *f);
+struct mp4 *mp4_open_meta(struct mp4_callback *cb);
 
 int mp4_meta_get_by_index(const struct mp4 *f, unsigned int index,
                             char **item, char **value);
-int32_t mp4_meta_update(struct mp4_callback *f,const struct mp4_metadata * data);
+int32_t mp4_meta_update(struct mp4_callback *cb, const struct mp4_metadata *data);
 
 int mp4_meta_get_num_items(const struct mp4 *f);
 int mp4_meta_get_artist(const struct mp4 *f, char **value);