diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-04-07 23:10:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-04-07 23:10:22 +0000 |
| commit | d7cf44899f6a9f82f19a3e3d7c40e3ab063d06f3 (patch) | |
| tree | 305ab6a31bcb1411330714a12d06894b0e78acdf /libavcodec/bethsoftvideo.c | |
| parent | ee77c2c922b9df4865ee02153c86090c46dd88e2 (diff) | |
| download | ffmpeg-d7cf44899f6a9f82f19a3e3d7c40e3ab063d06f3.tar.gz | |
use shorter names for the block type enum
Originally committed as revision 8664 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
| -rw-r--r-- | libavcodec/bethsoftvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index a59743789a..f2d332b1a3 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -51,7 +51,7 @@ static void set_palette(AVFrame * frame, uint8_t * palette_buffer) { uint32_t * palette = (uint32_t *)frame->data[1]; int a; - for(a = 0; a < VID_PALETTE_NUMCOLORS; a++) + for(a = 0; a < 256; a++) { palette[a] = AV_RB24(&palette_buffer[a * 3]) * 4; // multiply all colors by 4 } @@ -84,7 +84,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, switch(block_type = *buf++) { case PALETTE_BLOCK: set_palette(&vid->frame, buf); return 0; - case VIDEO_YOFFSET_DIFFERENCE_FRAME_BLOCK: + case VIDEO_YOFF_P_FRAME: yoffset = bytestream_get_le16(&buf); if(yoffset >= avctx->height) { return -1; } destination += vid->frame.linesize[0] * yoffset; @@ -99,7 +99,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, while(length > line_remaining) { if(rle_num_bytes < 0x80) { bytestream_get_buffer(&buf, destination, line_remaining); } - else if(block_type == VIDEO_FULL_FRAME_BLOCK) { memset(destination, buf[0], line_remaining); } + else if(block_type == VIDEO_I_FRAME) { memset(destination, buf[0], line_remaining); } length -= line_remaining; // decrement the number of bytes to be copied destination += line_remaining + wrap_to_next_line; // skip over extra bytes at end of frame line_remaining = avctx->width; @@ -108,7 +108,7 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, // copy any remaining bytes after / if line overflows if(rle_num_bytes < 0x80) { bytestream_get_buffer(&buf, destination, length); } - else if(block_type == VIDEO_FULL_FRAME_BLOCK) { memset(destination, *buf++, length); } + else if(block_type == VIDEO_I_FRAME) { memset(destination, *buf++, length); } line_remaining -= length; destination += length; } |