Mercurial > libavcodec.hg
comparison tiff.c @ 4364:05e932ddaaa9 libavcodec
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
author | alex |
---|---|
date | Fri, 19 Jan 2007 22:12:59 +0000 |
parents | cdefe220b007 |
children | 48952197d91f |
comparison
equal
deleted
inserted
replaced
4363:9b7662fa4905 | 4364:05e932ddaaa9 |
---|---|
85 int stripsize, stripoff; | 85 int stripsize, stripoff; |
86 LZWState *lzw; | 86 LZWState *lzw; |
87 } TiffContext; | 87 } TiffContext; |
88 | 88 |
89 static int tget_short(uint8_t **p, int le){ | 89 static int tget_short(uint8_t **p, int le){ |
90 int v = le ? LE_16(*p) : BE_16(*p); | 90 int v = le ? AV_RL16(*p) : AV_RB16(*p); |
91 *p += 2; | 91 *p += 2; |
92 return v; | 92 return v; |
93 } | 93 } |
94 | 94 |
95 static int tget_long(uint8_t **p, int le){ | 95 static int tget_long(uint8_t **p, int le){ |
96 int v = le ? LE_32(*p) : BE_32(*p); | 96 int v = le ? AV_RL32(*p) : AV_RB32(*p); |
97 *p += 4; | 97 *p += 4; |
98 return v; | 98 return v; |
99 } | 99 } |
100 | 100 |
101 static int tget(uint8_t **p, int type, int le){ | 101 static int tget(uint8_t **p, int type, int le){ |
445 uint8_t *orig_buf = buf, *end_buf = buf + buf_size; | 445 uint8_t *orig_buf = buf, *end_buf = buf + buf_size; |
446 int id, le, off; | 446 int id, le, off; |
447 int i, entries; | 447 int i, entries; |
448 | 448 |
449 //parse image header | 449 //parse image header |
450 id = LE_16(buf); buf += 2; | 450 id = AV_RL16(buf); buf += 2; |
451 if(id == 0x4949) le = 1; | 451 if(id == 0x4949) le = 1; |
452 else if(id == 0x4D4D) le = 0; | 452 else if(id == 0x4D4D) le = 0; |
453 else{ | 453 else{ |
454 av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n"); | 454 av_log(avctx, AV_LOG_ERROR, "TIFF header not found\n"); |
455 return -1; | 455 return -1; |