summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-17 02:31:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-17 02:31:11 +0100
commit84281d111c957f8c71691178bdcbc66c7c352f41 (patch)
treeddc1a24d84cb1e2187c49ebda0a54f19a396ec81 /libavcodec
parentcaedd51e56e2ad47991a1b8bddcfaa8f7094a060 (diff)
ff_mpeg4videodec_static_init: fix return type
Fixes CID743439 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mpeg4video.h2
-rw-r--r--libavcodec/mpeg4videodec.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 619fcd8fa8..97c39b6ed6 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -101,7 +101,7 @@ int ff_mpeg4_decode_partitions(MpegEncContext *s);
int ff_mpeg4_get_video_packet_prefix_length(MpegEncContext *s);
int ff_mpeg4_decode_video_packet_header(MpegEncContext *s);
void ff_mpeg4_init_direct_mv(MpegEncContext *s);
-int ff_mpeg4videodec_static_init(void);
+void ff_mpeg4videodec_static_init(void);
/**
*
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index b78f735a77..a55ab3474e 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2255,7 +2255,7 @@ end:
return decode_vop_header(s, gb);
}
-av_cold int ff_mpeg4videodec_static_init(void) {
+av_cold void ff_mpeg4videodec_static_init(void) {
static int done = 0;
if (!done) {