projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
55da88c
)
vcr1: Fix return type of common_init to match the function pointer signature.
author
Diego Biurrun
<diego@biurrun.de>
Mon, 14 May 2012 10:33:04 +0000
(12:33 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Mon, 14 May 2012 14:19:16 +0000
(16:19 +0200)
libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type
libavcodec/vcr1.c
patch
|
blob
|
history
diff --git
a/libavcodec/vcr1.c
b/libavcodec/vcr1.c
index
87b39b0
..
4f32631
100644
(file)
--- a/
libavcodec/vcr1.c
+++ b/
libavcodec/vcr1.c
@@
-33,11
+33,13
@@
typedef struct VCR1Context {
int offset[4];
} VCR1Context;
-static av_cold
void
common_init(AVCodecContext *avctx)
+static av_cold
int
common_init(AVCodecContext *avctx)
{
VCR1Context *const a = avctx->priv_data;
avctx->coded_frame = &a->picture;
+
+ return 0;
}
static av_cold int decode_init(AVCodecContext *avctx)