repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavcodec
/
snow_dwt.c
diff --git
a/ffmpeg/libavcodec/snow_dwt.c
b/ffmpeg/libavcodec/snow_dwt.c
index 63ff7a09959b46ca0d8eae470ae7df5a8076cb6f..5b890e01b55cfc1072a5e2bbd6cf696f37fc4a17 100644
(file)
--- a/
ffmpeg/libavcodec/snow_dwt.c
+++ b/
ffmpeg/libavcodec/snow_dwt.c
@@
-745,7
+745,7
@@
void ff_spatial_idwt(IDWTELEM *buffer, IDWTELEM *temp, int width, int height,
decomposition_count, y);
}
decomposition_count, y);
}
-static inline int w_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size,
+static inline int w_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size,
int w, int h, int type)
{
int s, i, j;
int w, int h, int type)
{
int s, i, j;
@@
-814,32
+814,32
@@
static inline int w_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, in
return s >> 9;
}
return s >> 9;
}
-static int w53_8_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size, int h)
+static int w53_8_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size, int h)
{
return w_c(v, pix1, pix2, line_size, 8, h, 1);
}
{
return w_c(v, pix1, pix2, line_size, 8, h, 1);
}
-static int w97_8_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size, int h)
+static int w97_8_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size, int h)
{
return w_c(v, pix1, pix2, line_size, 8, h, 0);
}
{
return w_c(v, pix1, pix2, line_size, 8, h, 0);
}
-static int w53_16_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size, int h)
+static int w53_16_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size, int h)
{
return w_c(v, pix1, pix2, line_size, 16, h, 1);
}
{
return w_c(v, pix1, pix2, line_size, 16, h, 1);
}
-static int w97_16_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size, int h)
+static int w97_16_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size, int h)
{
return w_c(v, pix1, pix2, line_size, 16, h, 0);
}
{
return w_c(v, pix1, pix2, line_size, 16, h, 0);
}
-int ff_w53_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size, int h)
+int ff_w53_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size, int h)
{
return w_c(v, pix1, pix2, line_size, 32, h, 1);
}
{
return w_c(v, pix1, pix2, line_size, 32, h, 1);
}
-int ff_w97_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
in
t line_size, int h)
+int ff_w97_32_c(struct MpegEncContext *v, uint8_t *pix1, uint8_t *pix2,
ptrdiff_
t line_size, int h)
{
return w_c(v, pix1, pix2, line_size, 32, h, 0);
}
{
return w_c(v, pix1, pix2, line_size, 32, h, 0);
}