diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-04-07 23:32:55 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-04-07 23:32:55 +0000 |
| commit | 3e62d187ed05a563684310521e6b4591d077f901 (patch) | |
| tree | abe7e59b551fac16ec5f7027ab219a7921d2dd9f /libavformat/bethsoftvid.c | |
| parent | fee9e80550b5e52304a83fdc63ca5ddaf0f0509a (diff) | |
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
Diffstat (limited to 'libavformat/bethsoftvid.c')
| -rw-r--r-- | libavformat/bethsoftvid.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 0b50471fd6..91fecb5841 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -101,7 +101,7 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt, { uint8_t * vidbuf_start = NULL; int vidbuf_nbytes = 0; - int rle_num_bytes; + int code; int bytes_copied = 0; int position; size_t vidbuf_capacity; @@ -130,18 +130,18 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt, if(!vidbuf_start) return AVERROR_NOMEM; - rle_num_bytes = get_byte(pb); - vidbuf_start[vidbuf_nbytes++] = rle_num_bytes; + code = get_byte(pb); + vidbuf_start[vidbuf_nbytes++] = code; - if(rle_num_bytes >= 0x80){ // rle sequence + if(code >= 0x80){ // rle sequence if(block_type == VIDEO_I_FRAME) vidbuf_start[vidbuf_nbytes++] = get_byte(pb); - } else if(rle_num_bytes){ // plain sequence - if(get_buffer(pb, &vidbuf_start[vidbuf_nbytes], rle_num_bytes) != rle_num_bytes) + } else if(code){ // plain sequence + if(get_buffer(pb, &vidbuf_start[vidbuf_nbytes], code) != code) 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 // may contain a 0 byte even if read all pixels if(get_byte(pb)) @@ -150,7 +150,7 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt, } if(bytes_copied > npixels) goto fail; - } while(rle_num_bytes); + } while(code); // copy data into packet if(av_new_packet(pkt, vidbuf_nbytes) < 0) |