diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-04-19 05:16:45 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-04-19 05:16:45 +0000 |
| commit | 97c50cb77949856573d7f5f5a3c28cb73e61e011 (patch) | |
| tree | 2dbabcbb9009b09d66789498ce1d2451a4b39bc0 /src/libffmpeg/libavcodec/wmv2.c | |
| parent | 19e7199dad84489aa49e3b2dd5c0e45657ec0fb8 (diff) | |
| download | xine-lib-97c50cb77949856573d7f5f5a3c28cb73e61e011.tar.gz xine-lib-97c50cb77949856573d7f5f5a3c28cb73e61e011.tar.bz2 | |
sync to FFmpeg build 4752
CVS patchset: 7463
CVS date: 2005/04/19 05:16:45
Diffstat (limited to 'src/libffmpeg/libavcodec/wmv2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/wmv2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/wmv2.c b/src/libffmpeg/libavcodec/wmv2.c index 13a112d1f..b6376d80b 100644 --- a/src/libffmpeg/libavcodec/wmv2.c +++ b/src/libffmpeg/libavcodec/wmv2.c @@ -101,6 +101,7 @@ static int wmv2_encode_init(AVCodecContext *avctx){ return 0; } +#if 0 /* unused, remove? */ static int wmv2_encode_end(AVCodecContext *avctx){ if(MPV_encode_end(avctx) < 0) @@ -111,6 +112,7 @@ static int wmv2_encode_end(AVCodecContext *avctx){ return 0; } +#endif int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number) { @@ -244,7 +246,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, if (s->pict_type == I_TYPE) { set_stat(ST_INTRA_MB); put_bits(&s->pb, - table_mb_intra[coded_cbp][1], table_mb_intra[coded_cbp][0]); + ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]); } else { put_bits(&s->pb, wmv2_inter_table[w->cbp_table_index][cbp][1], @@ -734,7 +736,7 @@ static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) cbp = code & 0x3f; } else { s->mb_intra = 1; - code = get_vlc2(&s->gb, mb_intra_vlc.table, MB_INTRA_VLC_BITS, 2); + code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); if (code < 0){ av_log(s->avctx, AV_LOG_ERROR, "II-cbp illegal at %d %d\n", s->mb_x, s->mb_y); return -1; |