projects
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo: occured --> occurred
[ffmpeg.git]
/
libavcodec
/
flashsv.c
diff --git
a/libavcodec/flashsv.c
b/libavcodec/flashsv.c
index
0be0e46
..
28579b7
100644
(file)
--- a/
libavcodec/flashsv.c
+++ b/
libavcodec/flashsv.c
@@
-79,7
+79,7
@@
static void copy_region(uint8_t *sptr, uint8_t *dptr,
}
}
-static int flashsv_decode_init(AVCodecContext *avctx)
+static
av_cold
int flashsv_decode_init(AVCodecContext *avctx)
{
FlashSVContext *s = avctx->priv_data;
int zret; // Zlib return code
{
FlashSVContext *s = avctx->priv_data;
int zret; // Zlib return code
@@
-102,7
+102,7
@@
static int flashsv_decode_init(AVCodecContext *avctx)
static int flashsv_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
static int flashsv_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+
const
uint8_t *buf, int buf_size)
{
FlashSVContext *s = avctx->priv_data;
int h_blocks, v_blocks, h_part, v_part, i, j;
{
FlashSVContext *s = avctx->priv_data;
int h_blocks, v_blocks, h_part, v_part, i, j;
@@
-200,7
+200,7
@@
static int flashsv_decode_frame(AVCodecContext *avctx,
ret = inflate(&(s->zstream), Z_FINISH);
if (ret == Z_DATA_ERROR)
{
ret = inflate(&(s->zstream), Z_FINISH);
if (ret == Z_DATA_ERROR)
{
- av_log(avctx, AV_LOG_ERROR, "Zlib resync occured\n");
+ av_log(avctx, AV_LOG_ERROR, "Zlib resync occur
r
ed\n");
inflateSync(&(s->zstream));
ret = inflate(&(s->zstream), Z_FINISH);
}
inflateSync(&(s->zstream));
ret = inflate(&(s->zstream), Z_FINISH);
}
@@
-228,7
+228,7
@@
static int flashsv_decode_frame(AVCodecContext *avctx,
}
}
-static int flashsv_decode_end(AVCodecContext *avctx)
+static
av_cold
int flashsv_decode_end(AVCodecContext *avctx)
{
FlashSVContext *s = avctx->priv_data;
inflateEnd(&(s->zstream));
{
FlashSVContext *s = avctx->priv_data;
inflateEnd(&(s->zstream));