git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
126abaa
)
rl2: use fixed-width integer types where appropriate
author
Anton Khirnov
<anton@khirnov.net>
Sat, 17 Nov 2012 06:40:45 +0000
(07:40 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Sun, 6 Jan 2013 12:31:40 +0000
(13:31 +0100)
libavcodec/rl2.c
patch
|
blob
|
history
diff --git
a/libavcodec/rl2.c
b/libavcodec/rl2.c
index
da60e24
..
a368e6b
100644
(file)
--- a/
libavcodec/rl2.c
+++ b/
libavcodec/rl2.c
@@
-43,10
+43,10
@@
typedef struct Rl2Context {
AVCodecContext *avctx;
AVFrame frame;
AVCodecContext *avctx;
AVFrame frame;
- u
nsigned short video_base;
///< initial drawing offset
- u
nsigned int clr_count;
///< number of used colors (currently unused)
- u
nsigned char* back_frame;
///< background frame
- u
nsigned in
t palette[AVPALETTE_COUNT];
+ u
int16_t video_base;
///< initial drawing offset
+ u
int32_t clr_count;
///< number of used colors (currently unused)
+ u
int8_t *back_frame;
///< background frame
+ u
int32_
t palette[AVPALETTE_COUNT];
} Rl2Context;
/**
} Rl2Context;
/**
@@
-58,16
+58,17
@@
typedef struct Rl2Context {
* @param stride stride of the output buffer
* @param video_base offset of the rle data inside the frame
*/
* @param stride stride of the output buffer
* @param video_base offset of the rle data inside the frame
*/
-static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size,
- unsigned char* out,int stride,int video_base){
+static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size,
+ uint8_t *out, int stride, int video_base)
+{
int base_x = video_base % s->avctx->width;
int base_y = video_base / s->avctx->width;
int stride_adj = stride - s->avctx->width;
int i;
int base_x = video_base % s->avctx->width;
int base_y = video_base / s->avctx->width;
int stride_adj = stride - s->avctx->width;
int i;
- const u
nsigned char*
back_frame = s->back_frame;
- const u
nsigned char*
in_end = in + size;
- const u
nsigned char*
out_end = out + stride * s->avctx->height;
- u
nsigned char*
line_end;
+ const u
int8_t *
back_frame = s->back_frame;
+ const u
int8_t *
in_end = in + size;
+ const u
int8_t *
out_end = out + stride * s->avctx->height;
+ u
int8_t *
line_end;
/** copy start of the background frame */
for(i=0;i<=base_y;i++){
/** copy start of the background frame */
for(i=0;i<=base_y;i++){
@@
-82,7
+83,7
@@
static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size,
/** decode the variable part of the frame */
while(in < in_end){
/** decode the variable part of the frame */
while(in < in_end){
- u
nsigned char
val = *in++;
+ u
int8_t
val = *in++;
int len = 1;
if(val >= 0x80){
if(in >= in_end)
int len = 1;
if(val >= 0x80){
if(in >= in_end)
@@
-160,7
+161,7
@@
static av_cold int rl2_decode_init(AVCodecContext *avctx)
back_size = avctx->extradata_size - EXTRADATA1_SIZE;
if(back_size > 0){
back_size = avctx->extradata_size - EXTRADATA1_SIZE;
if(back_size > 0){
- u
nsigned char*
back_frame = av_mallocz(avctx->width*avctx->height);
+ u
int8_t *
back_frame = av_mallocz(avctx->width*avctx->height);
if(!back_frame)
return AVERROR(ENOMEM);
rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,
if(!back_frame)
return AVERROR(ENOMEM);
rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,