RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

s/rle_num_bytes/code/ 

shorter and correcter (its not the number of anything)

Originally committed as revision 8673 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-04-07 23:32:55 +00:00
parent fee9e80550
commit 3e62d187ed
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/bethsoftvid.c
View File

@ -101,7 +101,7 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt,
{ {
uint8_t * vidbuf_start = NULL; uint8_t * vidbuf_start = NULL;
int vidbuf_nbytes = 0; int vidbuf_nbytes = 0;
int rle_num_bytes; int code;
int bytes_copied = 0; int bytes_copied = 0;
int position; int position;
size_t vidbuf_capacity; size_t vidbuf_capacity;
@ -130,18 +130,18 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt,
if(!vidbuf_start) if(!vidbuf_start)
return AVERROR_NOMEM; return AVERROR_NOMEM;
rle_num_bytes = get_byte(pb); code = get_byte(pb);
vidbuf_start[vidbuf_nbytes++] = rle_num_bytes; vidbuf_start[vidbuf_nbytes++] = code;
if(rle_num_bytes >= 0x80){ // rle sequence if(code >= 0x80){ // rle sequence
if(block_type == VIDEO_I_FRAME) if(block_type == VIDEO_I_FRAME)
vidbuf_start[vidbuf_nbytes++] = get_byte(pb); vidbuf_start[vidbuf_nbytes++] = get_byte(pb);
} else if(rle_num_bytes){ // plain sequence } else if(code){ // plain sequence
if(get_buffer(pb, &vidbuf_start[vidbuf_nbytes], rle_num_bytes) != rle_num_bytes) if(get_buffer(pb, &vidbuf_start[vidbuf_nbytes], code) != code)
goto fail; goto fail;
vidbuf_nbytes += rle_num_bytes; vidbuf_nbytes += code;
} }
bytes_copied += rle_num_bytes & 0x7F; bytes_copied += code & 0x7F;
if(bytes_copied == npixels){ // sometimes no stop character is given, need to keep track of bytes copied if(bytes_copied == npixels){ // sometimes no stop character is given, need to keep track of bytes copied
// may contain a 0 byte even if read all pixels // may contain a 0 byte even if read all pixels
if(get_byte(pb)) if(get_byte(pb))
@ -150,7 +150,7 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt,
} }
if(bytes_copied > npixels) if(bytes_copied > npixels)
goto fail; goto fail;
} while(rle_num_bytes); } while(code);
// copy data into packet // copy data into packet
if(av_new_packet(pkt, vidbuf_nbytes) < 0) if(av_new_packet(pkt, vidbuf_nbytes) < 0)