diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-06-21 03:58:57 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-06-21 03:58:57 +0000 |
| commit | 2a06f90f75f6e99af8b39d41e78dc6f6850fe68d (patch) | |
| tree | e215f9e2dbfef6eea251880179c3f73c6765f489 /src/libffmpeg/libavcodec/mpegvideo.h | |
| parent | 7ec65b9aeaded392195543631da79bcf912382ab (diff) | |
| download | xine-lib-2a06f90f75f6e99af8b39d41e78dc6f6850fe68d.tar.gz xine-lib-2a06f90f75f6e99af8b39d41e78dc6f6850fe68d.tar.bz2 | |
major purpose of this update is to import the rearranged MC edge
emulation facilities
CVS patchset: 5079
CVS date: 2003/06/21 03:58:57
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegvideo.h')
| -rw-r--r-- | src/libffmpeg/libavcodec/mpegvideo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/mpegvideo.h b/src/libffmpeg/libavcodec/mpegvideo.h index c09b6a6f3..5f3c10d24 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.h +++ b/src/libffmpeg/libavcodec/mpegvideo.h @@ -708,7 +708,7 @@ void ff_copy_bits(PutBitContext *pb, uint8_t *src, int length); void ff_clean_intra_table_entries(MpegEncContext *s); 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, +void ff_emulated_edge_mc(uint8_t *buf, uint8_t *src, int linesize, int block_w, int block_h, int src_x, int src_y, int w, int h); #define END_NOT_FOUND -100 int ff_combine_frame( MpegEncContext *s, int next, uint8_t **buf, int *buf_size); @@ -877,7 +877,7 @@ void ff_wmv2_encode_mb(MpegEncContext * s, DCTELEM block[6][64], int motion_x, int motion_y); -/* mjpegenc.c */ +/* mjpeg.c */ int mjpeg_init(MpegEncContext *s); void mjpeg_close(MpegEncContext *s); void mjpeg_encode_mb(MpegEncContext *s, |