Attachment 45296 Details for Bug 69874 – libxine.diff

[patch] libxine.diff

libxine.diff (text/plain), 5.92 KB, created by Michael Nottebrock on 2004-08-01 14:20:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Nottebrock

Created: 2004-08-01 14:20:21 UTC

Size: 5.92 KB

patch

obsolete

>Index: files/patch-src_libavcodec_mpeg12.c
>===================================================================
>RCS file: files/patch-src_libavcodec_mpeg12.c
>diff -N files/patch-src_libavcodec_mpeg12.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src_libavcodec_mpeg12.c	2 Aug 2004 14:38:43 -0000
>@@ -0,0 +1,68 @@
>+--- src/libffmpeg/libavcodec/mpeg12.c.orig	Mon Aug  2 14:18:46 2004
>++++ src/libffmpeg/libavcodec/mpeg12.c	Mon Aug  2 14:22:10 2004
>+@@ -65,16 +65,16 @@
>+                          int component);
>+ static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code);    // RAL: f_code parameter added
>+ #endif //CONFIG_ENCODERS
>+-static inline int mpeg1_decode_block_inter(MpegEncContext *s, 
>++static int mpeg1_decode_block_inter(MpegEncContext *s, 
>+                               DCTELEM *block, 
>+                               int n);
>+-static inline int mpeg1_decode_block_intra(MpegEncContext *s, 
>++static int mpeg1_decode_block_intra(MpegEncContext *s, 
>+                               DCTELEM *block, 
>+                               int n);
>+-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, 
>++static int mpeg2_decode_block_non_intra(MpegEncContext *s, 
>+                                         DCTELEM *block, 
>+                                         int n);
>+-static inline int mpeg2_decode_block_intra(MpegEncContext *s, 
>++static int mpeg2_decode_block_intra(MpegEncContext *s, 
>+                                     DCTELEM *block, 
>+                                     int n);
>+ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
>+@@ -1442,7 +1442,7 @@
>+     return val;
>+ }
>+ 
>+-static inline int decode_dc(GetBitContext *gb, int component)
>++static int decode_dc(GetBitContext *gb, int component)
>+ {
>+     int code, diff;
>+ 
>+@@ -1463,7 +1463,7 @@
>+     return diff;
>+ }
>+ 
>+-static inline int mpeg1_decode_block_intra(MpegEncContext *s, 
>++static int mpeg1_decode_block_intra(MpegEncContext *s, 
>+                                DCTELEM *block, 
>+                                int n)
>+ {
>+@@ -1536,7 +1536,7 @@
>+    return 0;
>+ }
>+ 
>+-static inline int mpeg1_decode_block_inter(MpegEncContext *s, 
>++static int mpeg1_decode_block_inter(MpegEncContext *s, 
>+                                DCTELEM *block, 
>+                                int n)
>+ {
>+@@ -1614,7 +1614,7 @@
>+ 
>+ /* Also does unquantization here, since I will never support mpeg2
>+    encoding */
>+-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s, 
>++static int mpeg2_decode_block_non_intra(MpegEncContext *s, 
>+                                DCTELEM *block, 
>+                                int n)
>+ {
>+@@ -1693,7 +1693,7 @@
>+     return 0;
>+ }
>+ 
>+-static inline int mpeg2_decode_block_intra(MpegEncContext *s, 
>++static int mpeg2_decode_block_intra(MpegEncContext *s, 
>+                                DCTELEM *block, 
>+                                int n)
>+ {
>Index: files/patch-src_libavcodec_msmpeg4.c
>===================================================================
>RCS file: files/patch-src_libavcodec_msmpeg4.c
>diff -N files/patch-src_libavcodec_msmpeg4.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src_libavcodec_msmpeg4.c	2 Aug 2004 14:38:43 -0000
>@@ -0,0 +1,20 @@
>+--- src/libffmpeg/libavcodec/msmpeg4.orig	Mon Aug  2 14:22:57 2004
>++++ src/libffmpeg/libavcodec/msmpeg4.c	Mon Aug  2 14:23:25 2004
>+@@ -60,7 +60,7 @@
>+ static uint32_t v2_dc_chroma_table[512][2];
>+ 
>+ static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
>+-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>++static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>+                                        int n, int coded, const uint8_t *scantable);
>+ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
>+ static int msmpeg4_decode_motion(MpegEncContext * s, 
>+@@ -1656,7 +1656,7 @@
>+     return 0;
>+ }
>+ //#define ERROR_DETAILS
>+-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>++static int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>+                               int n, int coded, const uint8_t *scan_table)
>+ {
>+     int level, i, last, run, run_diff;
>Index: files/patch-src_libffmpeg_libavcodec_h263.c
>===================================================================
>RCS file: files/patch-src_libffmpeg_libavcodec_h263.c
>diff -N files/patch-src_libffmpeg_libavcodec_h263.c
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src_libffmpeg_libavcodec_h263.c	2 Aug 2004 14:38:43 -0000
>@@ -0,0 +1,31 @@
>+--- src/libffmpeg/libavcodec/h263.c.orig	Sun May 30 19:24:19 2004
>++++ src/libffmpeg/libavcodec/h263.c	Sun Aug  1 12:52:11 2004
>+@@ -66,8 +66,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 mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
>++static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>+                               int n, int coded, int intra, int rvlc);
>+ static int h263_pred_dc(MpegEncContext * s, int n, uint16_t **dc_val_ptr);
>+ #ifdef CONFIG_ENCODERS
>+@@ -4548,7 +4548,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 int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
>+ {
>+     int level, code;
>+ 
>+@@ -4593,7 +4593,7 @@
>+  * decodes a block.
>+  * @return <0 if an error occured
>+  */
>+-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>++static int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
>+                               int n, int coded, int intra, int rvlc)
>+ {
>+     int level, i, last, run;

Actions: View | Diff

Attachments on bug 69874: 45296