diff options
Diffstat (limited to 'apps/metadata/rm.c')
-rw-r--r-- | apps/metadata/rm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/apps/metadata/rm.c b/apps/metadata/rm.c index e4b5005f2d..4b52c34d02 100644 --- a/apps/metadata/rm.c +++ b/apps/metadata/rm.c | |||
@@ -60,15 +60,16 @@ struct real_object_t | |||
60 | uint16_t version; | 60 | uint16_t version; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | #define FOURCC(a,b,c,d) (((a)<<24) | ((b) << 16) | ((c) << 8) | (d)) | ||
64 | |||
65 | static int real_read_object_header(int fd, struct real_object_t* obj) | 63 | static int real_read_object_header(int fd, struct real_object_t* obj) |
66 | { | 64 | { |
67 | int n; | 65 | int n; |
68 | 66 | ||
69 | if ((n = read_uint32be(fd, &obj->fourcc)) <= 0) return n; | 67 | if ((n = read_uint32be(fd, &obj->fourcc)) <= 0) |
70 | if ((n = read_uint32be(fd, &obj->size)) <= 0) return n; | 68 | return n; |
71 | if ((n = read_uint16be(fd, &obj->version)) <= 0) return n; | 69 | if ((n = read_uint32be(fd, &obj->size)) <= 0) |
70 | return n; | ||
71 | if ((n = read_uint16be(fd, &obj->version)) <= 0) | ||
72 | return n; | ||
72 | 73 | ||
73 | return 1; | 74 | return 1; |
74 | } | 75 | } |