Module: libav Branch: master Commit: 80951f5cf6cd34b317857c710d8cce09b0b73c4f
Author: Raivo Hool <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Oct 21 16:04:13 2011 +0300 mov: rename function _int8 to remove ambiguity, some indentation cosmetics Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/mov.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3c551c6..84bd4ed 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -100,20 +100,20 @@ static int mov_metadata_track_or_disc_number(MOVContext *c, AVIOContext *pb, return 0; } -static int mov_metadata_int8(MOVContext *c, AVIOContext *pb, - unsigned len, const char *key) +static int mov_metadata_int8_bypass_padding(MOVContext *c, AVIOContext *pb, + unsigned len, const char *key) { - char buf[16]; + char buf[16]; - /* bypass padding bytes */ - avio_r8(pb); - avio_r8(pb); - avio_r8(pb); + /* bypass padding bytes */ + avio_r8(pb); + avio_r8(pb); + avio_r8(pb); - snprintf(buf, sizeof(buf), "%hu", avio_r8(pb)); - av_dict_set(&c->fc->metadata, key, buf, 0); + snprintf(buf, sizeof(buf), "%hu", avio_r8(pb)); + av_dict_set(&c->fc->metadata, key, buf, 0); - return 0; + return 0; } static int mov_metadata_stik(MOVContext *c, AVIOContext *pb, @@ -220,9 +220,9 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) case MKTAG( 'd','i','s','k'): key = "disc"; parse = mov_metadata_track_or_disc_number; break; case MKTAG( 't','v','e','s'): key = "episode_sort"; - parse = mov_metadata_int8; break; + parse = mov_metadata_int8_bypass_padding; break; case MKTAG( 't','v','s','n'): key = "season_number"; - parse = mov_metadata_int8; break; + parse = mov_metadata_int8_bypass_padding; break; case MKTAG( 's','t','i','k'): key = "media_type"; parse = mov_metadata_stik; break; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
