diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-10-27 15:24:38 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-10-27 15:24:38 +0000 |
| commit | c5b6afab8b74e5cc938b8467d3808a877ded7d03 (patch) | |
| tree | 4a9738571b6330c8895c6ad3faec4d68f72fbb16 /src/libffmpeg/libavcodec/wmv2.c | |
| parent | d2a72f348508fd0a78a80f4da795dcf3155f02bc (diff) | |
| download | xine-lib-c5b6afab8b74e5cc938b8467d3808a877ded7d03.tar.gz xine-lib-c5b6afab8b74e5cc938b8467d3808a877ded7d03.tar.bz2 | |
super mega ffmpeg tree sync
CVS patchset: 5615
CVS date: 2003/10/27 15:24:38
Diffstat (limited to 'src/libffmpeg/libavcodec/wmv2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/wmv2.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/wmv2.c b/src/libffmpeg/libavcodec/wmv2.c index ea4f407eb..f68664820 100644 --- a/src/libffmpeg/libavcodec/wmv2.c +++ b/src/libffmpeg/libavcodec/wmv2.c @@ -64,7 +64,7 @@ static int encode_ext_header(Wmv2Context *w){ PutBitContext pb; int code; - init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size, NULL, NULL); + init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size); put_bits(&pb, 5, s->avctx->frame_rate / s->avctx->frame_rate_base); //yes 29.97 -> 29 put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047)); @@ -101,7 +101,6 @@ static int wmv2_encode_init(AVCodecContext *avctx){ } static int wmv2_encode_end(AVCodecContext *avctx){ - Wmv2Context * const w= avctx->priv_data; if(MPV_encode_end(avctx) < 0) return -1; @@ -587,7 +586,6 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){ MpegEncContext * const s= &w->s; - uint8_t temp[2][64]; switch(w->abt_type_table[n]){ case 0: |