diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2007-01-19 22:12:59 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2007-01-19 22:12:59 +0000 |
| commit | fead30d4440bc7b75006ae60f2742c63a05168b3 (patch) | |
| tree | cead68d924846c1bfb756bb46c86184d889d10db /libavformat/ipmovie.c | |
| parent | 50eaa857c099abda803c803927276d81c2d74edb (diff) | |
| download | ffmpeg-fead30d4440bc7b75006ae60f2742c63a05168b3.tar.gz | |
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/ipmovie.c')
| -rw-r--r-- | libavformat/ipmovie.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 3c04599380..e6470fa0ca 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -236,8 +236,8 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, if (get_buffer(pb, chunk_preamble, CHUNK_PREAMBLE_SIZE) != CHUNK_PREAMBLE_SIZE) return CHUNK_BAD; - chunk_size = LE_16(&chunk_preamble[0]); - chunk_type = LE_16(&chunk_preamble[2]); + chunk_size = AV_RL16(&chunk_preamble[0]); + chunk_type = AV_RL16(&chunk_preamble[2]); debug_ipmovie("chunk type 0x%04X, 0x%04X bytes: ", chunk_type, chunk_size); @@ -287,7 +287,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, break; } - opcode_size = LE_16(&opcode_preamble[0]); + opcode_size = AV_RL16(&opcode_preamble[0]); opcode_type = opcode_preamble[2]; opcode_version = opcode_preamble[3]; @@ -325,10 +325,10 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_type = CHUNK_BAD; break; } - s->fps = 1000000.0 / (LE_32(&scratch[0]) * LE_16(&scratch[4])); + s->fps = 1000000.0 / (AV_RL32(&scratch[0]) * AV_RL16(&scratch[4])); s->frame_pts_inc = 90000 / s->fps; debug_ipmovie(" %.2f frames/second (timer div = %d, subdiv = %d)\n", - s->fps, LE_32(&scratch[0]), LE_16(&scratch[4])); + s->fps, AV_RL32(&scratch[0]), AV_RL16(&scratch[4])); break; case OPCODE_INIT_AUDIO_BUFFERS: @@ -343,8 +343,8 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_type = CHUNK_BAD; break; } - s->audio_sample_rate = LE_16(&scratch[4]); - audio_flags = LE_16(&scratch[2]); + s->audio_sample_rate = AV_RL16(&scratch[4]); + audio_flags = AV_RL16(&scratch[2]); /* bit 0 of the flags: 0 = mono, 1 = stereo */ s->audio_channels = (audio_flags & 1) + 1; /* bit 1 of the flags: 0 = 8 bit, 1 = 16 bit */ @@ -381,8 +381,8 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, chunk_type = CHUNK_BAD; break; } - s->video_width = LE_16(&scratch[0]) * 8; - s->video_height = LE_16(&scratch[2]) * 8; + s->video_width = AV_RL16(&scratch[0]) * 8; + s->video_height = AV_RL16(&scratch[2]) * 8; debug_ipmovie("video resolution: %d x %d\n", s->video_width, s->video_height); break; @@ -442,8 +442,8 @@ static int process_ipmovie_chunk(IPMVEContext *s, ByteIOContext *pb, } /* load the palette into internal data structure */ - first_color = LE_16(&scratch[0]); - last_color = first_color + LE_16(&scratch[2]) - 1; + first_color = AV_RL16(&scratch[0]); + last_color = first_color + AV_RL16(&scratch[2]) - 1; /* sanity check (since they are 16 bit values) */ if ((first_color > 0xFF) || (last_color > 0xFF)) { debug_ipmovie("demux_ipmovie: set_palette indices out of range (%d -> %d)\n", @@ -542,7 +542,7 @@ static int ipmovie_read_header(AVFormatContext *s, if (get_buffer(pb, chunk_preamble, CHUNK_PREAMBLE_SIZE) != CHUNK_PREAMBLE_SIZE) return AVERROR_IO; - chunk_type = LE_16(&chunk_preamble[2]); + chunk_type = AV_RL16(&chunk_preamble[2]); url_fseek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR); if (chunk_type == CHUNK_VIDEO) |