diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 16:53:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:22:52 +0100 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /libavformat/ipmovie.c | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
| download | ffmpeg-0fecf2642b9d909820683647c70031a954f5e58d.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b54df38b23..8ea59a3b08 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -299,12 +299,12 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, case OPCODE_END_OF_STREAM: debug_ipmovie("end of stream\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_END_OF_CHUNK: debug_ipmovie("end of chunk\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_CREATE_TIMER: @@ -359,7 +359,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, case OPCODE_START_STOP_AUDIO: debug_ipmovie("start/stop audio\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_INIT_VIDEO_BUFFERS: @@ -393,12 +393,12 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, case OPCODE_UNKNOWN_14: case OPCODE_UNKNOWN_15: debug_ipmovie("unknown (but documented) opcode %02X\n", opcode_type); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_SEND_BUFFER: debug_ipmovie("send buffer\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_AUDIO_FRAME: @@ -407,22 +407,22 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, /* log position and move on for now */ s->audio_chunk_offset = avio_tell(pb); s->audio_chunk_size = opcode_size; - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_SILENCE_FRAME: debug_ipmovie("silence frame\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_INIT_VIDEO_MODE: debug_ipmovie("initialize video mode\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_CREATE_GRADIENT: debug_ipmovie("create gradient\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_SET_PALETTE: @@ -464,7 +464,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, case OPCODE_SET_PALETTE_COMPRESSED: debug_ipmovie("set palette compressed\n"); - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_SET_DECODING_MAP: @@ -473,7 +473,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, /* log position and move on for now */ s->decode_map_chunk_offset = avio_tell(pb); s->decode_map_chunk_size = opcode_size; - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; case OPCODE_VIDEO_DATA: @@ -482,7 +482,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, /* log position and move on for now */ s->video_chunk_offset = avio_tell(pb); s->video_chunk_size = opcode_size; - avio_seek(pb, opcode_size, SEEK_CUR); + avio_skip(pb, opcode_size); break; default: |