From df5fbeb013e70f14090cec1998a5f923d6713a1d Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sun, 30 May 2004 19:24:17 +0000 Subject: merge ffmpeg to fix compiler warnings CVS patchset: 6612 CVS date: 2004/05/30 19:24:17 --- src/libffmpeg/libavcodec/wmv2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/libffmpeg/libavcodec/wmv2.c') diff --git a/src/libffmpeg/libavcodec/wmv2.c b/src/libffmpeg/libavcodec/wmv2.c index 376f0706e..13a112d1f 100644 --- a/src/libffmpeg/libavcodec/wmv2.c +++ b/src/libffmpeg/libavcodec/wmv2.c @@ -59,6 +59,8 @@ static void wmv2_common_init(Wmv2Context * w){ ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], wmv2_scantableB); } +#ifdef CONFIG_ENCODERS + static int encode_ext_header(Wmv2Context *w){ MpegEncContext * const s= &w->s; PutBitContext pb; @@ -84,7 +86,6 @@ static int encode_ext_header(Wmv2Context *w){ return 0; } -#ifdef CONFIG_ENCODERS static int wmv2_encode_init(AVCodecContext *avctx){ Wmv2Context * const w= avctx->priv_data; @@ -478,9 +479,6 @@ s->picture_number++; //FIXME ? return 0; } -static void ff_wmv2_decode_init(MpegEncContext *s){ -} - static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){ MpegEncContext * const s= &w->s; int ret; -- cgit v1.2.3