From 6f3b07176ae833429586bf9d27c8477db9efa7a7 Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Thu, 19 Jun 2003 00:47:19 +0000 Subject: maintenance ffmpeg sync: import and activate decoders for 4X and RealAudio codecs; import VP3 decoder but leave de-activated; fixes for SVQ3 bugs; more conditional compilation for encoders CVS patchset: 5067 CVS date: 2003/06/19 00:47:19 --- src/libffmpeg/libavcodec/mpegvideo.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/libffmpeg/libavcodec/mpegvideo.h') diff --git a/src/libffmpeg/libavcodec/mpegvideo.h b/src/libffmpeg/libavcodec/mpegvideo.h index 2cbc0ef19..c09b6a6f3 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.h +++ b/src/libffmpeg/libavcodec/mpegvideo.h @@ -706,11 +706,10 @@ void MPV_common_init_ppc(MpegEncContext *s); extern void (*draw_edges)(uint8_t *buf, int wrap, int width, int height, int w); void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length); void ff_clean_intra_table_entries(MpegEncContext *s); -void ff_init_scantable(MpegEncContext *s, ScanTable *st, const uint8_t *src_scantable); +void ff_init_scantable(uint8_t *, ScanTable *st, const uint8_t *src_scantable); void ff_draw_horiz_band(MpegEncContext *s, int y, int h); void ff_emulated_edge_mc(MpegEncContext *s, uint8_t *src, int linesize, int block_w, int block_h, int src_x, int src_y, int w, int h); -char ff_get_pict_type_char(int pict_type); #define END_NOT_FOUND -100 int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size); void ff_print_debug_info(MpegEncContext *s, Picture *pict); -- cgit v1.2.3