View | Details | Raw Unified | Return to bug 69874
Collapse All | Expand All

(-)files/patch-src_libavcodec_mpeg12.c (+68 lines)
Added Link Here
1 
--- src/libffmpeg/libavcodec/mpeg12.c.orig	Mon Aug  2 14:18:46 2004
2 
+++ src/libffmpeg/libavcodec/mpeg12.c	Mon Aug  2 14:22:10 2004
3 
@@ -65,16 +65,16 @@
4 
                          int component);
5 
 static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code);    // RAL: f_code parameter added
6 
 #endif //CONFIG_ENCODERS
7 
-static inline int mpeg1_decode_block_inter(MpegEncContext *s,
8 
+static int mpeg1_decode_block_inter(MpegEncContext *s,
9 
                               DCTELEM *block,
10 
                               int n);
11 
-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
12 
+static int mpeg1_decode_block_intra(MpegEncContext *s,
13 
                               DCTELEM *block,
14 
                               int n);
15 
-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
16 
+static int mpeg2_decode_block_non_intra(MpegEncContext *s,
17 
                                         DCTELEM *block,
18 
                                         int n);
19 
-static inline int mpeg2_decode_block_intra(MpegEncContext *s,
20 
+static int mpeg2_decode_block_intra(MpegEncContext *s,
21 
                                     DCTELEM *block,
22 
                                     int n);
23 
 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
24 
@@ -1442,7 +1442,7 @@
25 
     return val;
26 
 }
27
28 
-static inline int decode_dc(GetBitContext *gb, int component)
29 
+static int decode_dc(GetBitContext *gb, int component)
30 
 {
31 
     int code, diff;
32
33 
@@ -1463,7 +1463,7 @@
34 
     return diff;
35 
 }
36
37 
-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
38 
+static int mpeg1_decode_block_intra(MpegEncContext *s,
39 
                                DCTELEM *block,
40 
                                int n)
41 
 {
42 
@@ -1536,7 +1536,7 @@
43 
    return 0;
44 
 }
45
46 
-static inline int mpeg1_decode_block_inter(MpegEncContext *s,
47 
+static int mpeg1_decode_block_inter(MpegEncContext *s,
48 
                                DCTELEM *block,
49 
                                int n)
50 
 {
51 
@@ -1614,7 +1614,7 @@
52
53 
 /* Also does unquantization here, since I will never support mpeg2
54 
    encoding */
55 
-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
56 
+static int mpeg2_decode_block_non_intra(MpegEncContext *s,
57 
                                DCTELEM *block,
58 
                                int n)
59 
 {
60 
@@ -1693,7 +1693,7 @@
61 
     return 0;
62 
 }
63
64 
-static inline int mpeg2_decode_block_intra(MpegEncContext *s,
65 
+static int mpeg2_decode_block_intra(MpegEncContext *s,
66 
                                DCTELEM *block,
67 
                                int n)
68 
 {
(-)files/patch-src_libavcodec_msmpeg4.c (+20 lines)
Added Link Here
1 
--- src/libffmpeg/libavcodec/msmpeg4.orig	Mon Aug  2 14:22:57 2004
2 
+++ src/libffmpeg/libavcodec/msmpeg4.c	Mon Aug  2 14:23:25 2004
3 
@@ -60,7 +60,7 @@
4 
 static uint32_t v2_dc_chroma_table[512][2];
5
6 
 static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
7 
-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
8 
+static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
9 
                                        int n, int coded, const uint8_t *scantable);
10 
 static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
11 
 static int msmpeg4_decode_motion(MpegEncContext * s,
12 
@@ -1656,7 +1656,7 @@
13 
     return 0;
14 
 }
15 
 //#define ERROR_DETAILS
16 
-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
17 
+static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
18 
                               int n, int coded, const uint8_t *scan_table)
19 
 {
20 
     int level, i, last, run, run_diff;
(-)files/patch-src_libffmpeg_libavcodec_h263.c (+31 lines)
Added Link Here
1 
--- src/libffmpeg/libavcodec/h263.c.orig	Sun May 30 19:24:19 2004
2 
+++ src/libffmpeg/libavcodec/h263.c	Sun Aug  1 12:52:11 2004
3 
@@ -66,8 +66,8 @@
4 
 static int h263p_decode_umotion(MpegEncContext * s, int pred);
5 
 static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
6 
                              int n, int coded);
7 
-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
8 
-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
9 
+static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
10 
+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
11 
                               int n, int coded, int intra, int rvlc);
12 
 static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr);
13 
 #ifdef CONFIG_ENCODERS
14 
@@ -4548,7 +4548,7 @@
15 
  * @param dir_ptr the prediction direction will be stored here
16 
  * @return the quantized dc
17 
  */
18 
-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
19 
+static int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
20 
 {
21 
     int level, code;
22
23 
@@ -4593,7 +4593,7 @@
24 
  * decodes a block.
25 
  * @return <0 if an error occured
26 
  */
27 
-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
28 
+static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
29 
                               int n, int coded, int intra, int rvlc)
30 
 {
31 
     int level, i, last, run;

Return to bug 69874