[FFmpeg-cvslog] vcr1: Fix return type of common_init to match the function pointer signature.

Diego Biurrun git at videolan.org
Mon May 14 21:12:26 CEST 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Mon May 14 12:33:04 2012 +0200| [a761e5951cc571baf36658eb0e98b148e5fb963f] | committer: Diego Biurrun

vcr1: Fix return type of common_init to match the function pointer signature.

libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a761e5951cc571baf36658eb0e98b148e5fb963f
---

 libavcodec/vcr1.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 87b39b0..4f32631 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)



More information about the ffmpeg-cvslog mailing list