forked from Lainports/freebsd-ports
39 lines
1.6 KiB
C
39 lines
1.6 KiB
C
--- src/libffmpeg/libavcodec/h263.c.orig Sun Jul 9 16:38:11 2006
|
|
+++ src/libffmpeg/libavcodec/h263.c Thu Sep 28 12:53:39 2006
|
|
@@ -38,6 +38,7 @@
|
|
#include "mpegvideo.h"
|
|
#include "h263data.h"
|
|
#include "mpeg4data.h"
|
|
+#include "xine_internal.h"
|
|
|
|
//#undef NDEBUG
|
|
//#include <assert.h>
|
|
@@ -66,8 +67,8 @@
|
|
static int h263p_decode_umotion(MpegEncContext * s, int pred);
|
|
static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
|
|
int n, int coded);
|
|
-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
|
|
-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
|
|
+static int __inline mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
|
|
+static int __inline mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
|
|
int n, int coded, int intra, int rvlc);
|
|
static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
|
|
uint8_t *scan_table);
|
|
@@ -4684,7 +4685,7 @@
|
|
* @param dir_ptr the prediction direction will be stored here
|
|
* @return the quantized dc
|
|
*/
|
|
-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
|
|
+static __inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
|
|
{
|
|
int level, code;
|
|
|
|
@@ -4729,7 +4730,7 @@
|
|
* decodes a block.
|
|
* @return <0 if an error occured
|
|
*/
|
|
-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
|
|
+static __inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
|
|
int n, int coded, int intra, int rvlc)
|
|
{
|
|
int level, i, last, run;
|