aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-05-14 12:33:04 +0200
committerDiego Biurrun <diego@biurrun.de>2012-05-14 16:19:16 +0200
commita761e5951cc571baf36658eb0e98b148e5fb963f (patch)
tree05e619b5a99bc4038cfc463989c37878f7c8c31c /libavcodec
parent55da88c5ab546c64cc5310768ad0f2bd81e6e26d (diff)
downloadffmpeg-a761e5951cc571baf36658eb0e98b148e5fb963f.tar.gz
vcr1: Fix return type of common_init to match the function pointer signature.
libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vcr1.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 87b39b0527..4f32631ca0 100644
--- 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)