Mercurial > libavcodec.hg
comparison mjpegdec.c @ 12128:ee740a4e80c5 libavcodec
bswap: change ME to NE in macro names
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.
| author | mru |
|---|---|
| date | Sat, 10 Jul 2010 22:09:01 +0000 |
| parents | c35d7bc64882 |
| children | 8b28e74de2c0 |
comparison
equal
deleted
inserted
replaced
| 12127:9ba7d2a5b20a | 12128:ee740a4e80c5 |
|---|---|
| 1025 return -1; | 1025 return -1; |
| 1026 if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits) | 1026 if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits) |
| 1027 return -1; | 1027 return -1; |
| 1028 | 1028 |
| 1029 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); | 1029 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
| 1030 id = be2me_32(id); | 1030 id = be2ne_32(id); |
| 1031 len -= 6; | 1031 len -= 6; |
| 1032 | 1032 |
| 1033 if(s->avctx->debug & FF_DEBUG_STARTCODE){ | 1033 if(s->avctx->debug & FF_DEBUG_STARTCODE){ |
| 1034 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id); | 1034 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id); |
| 1035 } | 1035 } |
| 1132 | 1132 |
| 1133 /* Apple MJPEG-A */ | 1133 /* Apple MJPEG-A */ |
| 1134 if ((s->start_code == APP1) && (len > (0x28 - 8))) | 1134 if ((s->start_code == APP1) && (len > (0x28 - 8))) |
| 1135 { | 1135 { |
| 1136 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); | 1136 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); |
| 1137 id = be2me_32(id); | 1137 id = be2ne_32(id); |
| 1138 len -= 4; | 1138 len -= 4; |
| 1139 if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */ | 1139 if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */ |
| 1140 { | 1140 { |
| 1141 #if 0 | 1141 #if 0 |
| 1142 skip_bits(&s->gb, 32); /* field size */ | 1142 skip_bits(&s->gb, 32); /* field size */ |