Bug#353045: a rubbish patch
Sam Morris
sam at robots.org.uk
Tue Feb 21 18:58:58 UTC 2006
>From looking at ffmpeg's latest CVS code, the problematic function
definitions are either wrapped by:
#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
or are not inside CONFIG_MUXERS at all.
Therefore the problem is caused by gst-ffmpeg including a buggy/outdated
version of ffmpeg, or else by their autoconf stuff.
Since this will eventually be fixed when gstreamer updates or fixes
their copy of ffmpeg, I have made a patch that moves only the missing
symbols outside of the #ifdefs. In addition, since the file that
contains 'mpegts_crc32' is only compiled if CONFIG_ENCODERS is enabled,
I copied the code for that function to mpegts.c, where it is referenced.
--
Sam Morris
http://robots.org.uk/
PGP key id 5EA01078
3412 EA18 1277 354B 991B C869 B219 7FDB 5EA0 1078
-------------- next part --------------
--- gstreamer0.10-ffmpeg-0.10.0.orig/gst-libs/ext/ffmpeg/libavformat/aviobuf.c 2005-10-21 15:30:31.000000000 +0100
+++ gstreamer0.10-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/aviobuf.c 2006-02-21 16:03:05.000000000 +0000
@@ -54,7 +54,6 @@
}
-#ifdef CONFIG_MUXERS
static void flush_buffer(ByteIOContext *s)
{
if (s->buf_ptr > s->buffer) {
@@ -104,7 +103,6 @@
flush_buffer(s);
s->must_flush = 0;
}
-#endif //CONFIG_MUXERS
offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
{
@@ -193,7 +191,6 @@
return s->error;
}
-#ifdef CONFIG_MUXERS
void put_le32(ByteIOContext *s, unsigned int val)
{
put_byte(s, val);
@@ -210,6 +207,7 @@
put_byte(s, val);
}
+#ifdef CONFIG_MUXERS
void put_strz(ByteIOContext *s, const char *str)
{
if (str)
@@ -223,6 +221,7 @@
put_le32(s, (uint32_t)(val & 0xffffffff));
put_le32(s, (uint32_t)(val >> 32));
}
+#endif
void put_be64(ByteIOContext *s, uint64_t val)
{
@@ -242,11 +241,13 @@
put_byte(s, val);
}
+#ifdef CONFIG_MUXERS
void put_be24(ByteIOContext *s, unsigned int val)
{
put_be16(s, val >> 8);
put_byte(s, val);
}
+#endif
void put_tag(ByteIOContext *s, const char *tag)
{
@@ -254,7 +255,6 @@
put_byte(s, *tag++);
}
}
-#endif //CONFIG_MUXERS
/* Input stream */
--- gstreamer0.10-ffmpeg-0.10.0.orig/gst-libs/ext/ffmpeg/libavformat/avio.c 2005-10-21 15:30:30.000000000 +0100
+++ gstreamer0.10-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/avio.c 2006-02-21 15:57:30.000000000 +0000
@@ -100,7 +100,6 @@
return ret;
}
-#ifdef CONFIG_MUXERS
int url_write(URLContext *h, unsigned char *buf, int size)
{
int ret;
@@ -112,7 +111,6 @@
ret = h->prot->url_write(h, buf, size);
return ret;
}
-#endif //CONFIG_MUXERS
offset_t url_seek(URLContext *h, offset_t pos, int whence)
{
--- gstreamer0.10-ffmpeg-0.10.0.orig/gst-libs/ext/ffmpeg/libavformat/mmf.c 2005-10-21 15:30:31.000000000 +0100
+++ gstreamer0.10-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/mmf.c 2006-02-21 16:15:35.000000000 +0000
@@ -24,9 +24,9 @@
offset_t data_size;
} MMFContext;
-#ifdef CONFIG_MUXERS
static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
+#ifdef CONFIG_MUXERS
static int mmf_rate_code(int rate)
{
int i;
@@ -35,6 +35,7 @@
return i;
return -1;
}
+#endif
static int mmf_rate(int code)
{
@@ -43,6 +44,7 @@
return mmf_rates[code];
}
+#ifdef CONFIG_MUXERS
/* Copy of end_tag() from avienc.c, but for big-endian chunk size */
static void end_tag_be(ByteIOContext *pb, offset_t start)
{
--- gstreamer0.10-ffmpeg-0.10.0.orig/gst-libs/ext/ffmpeg/libavformat/mpegts.c 2005-10-21 15:30:31.000000000 +0100
+++ gstreamer0.10-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/mpegts.c 2006-02-21 18:26:40.000000000 +0000
@@ -114,6 +114,67 @@
MpegTSFilter *pids[NB_PID_MAX];
};
+#ifndef CONFIG_MUXERS
+/* these live in mpegtsenc.c, which is only built if CONFIG_ENCODERS is
+ defined. */
+static const uint32_t crc_table[256] = {
+ 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
+ 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+ 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7,
+ 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+ 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3,
+ 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+ 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef,
+ 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+ 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb,
+ 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+ 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0,
+ 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+ 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4,
+ 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+ 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08,
+ 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+ 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc,
+ 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+ 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050,
+ 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+ 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34,
+ 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+ 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1,
+ 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+ 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5,
+ 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+ 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9,
+ 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+ 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd,
+ 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+ 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71,
+ 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+ 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2,
+ 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+ 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e,
+ 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+ 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a,
+ 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+ 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676,
+ 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+ 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662,
+ 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+ 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+};
+
+unsigned int mpegts_crc32(const uint8_t *data, int len)
+{
+ register int i;
+ unsigned int crc = 0xffffffff;
+
+ for (i=0; i<len; i++)
+ crc = (crc << 8) ^ crc_table[((crc >> 24) ^ *data++) & 0xff];
+
+ return crc;
+}
+#endif
+
static void write_section_data(AVFormatContext *s, MpegTSFilter *tss1,
const uint8_t *buf, int buf_size, int is_start)
{
--- gstreamer0.10-ffmpeg-0.10.0.orig/gst-libs/ext/ffmpeg/libavformat/nut.c 2005-10-21 15:30:31.000000000 +0100
+++ gstreamer0.10-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/nut.c 2006-02-21 18:20:06.000000000 +0000
@@ -689,6 +689,7 @@
return 0;
}
+#endif
static int64_t lsb2full(StreamContext *stream, int64_t lsb){
int64_t mask = (1<<stream->msb_timestamp_shift)-1;
@@ -696,6 +697,7 @@
return ((lsb - delta)&mask) + delta;
}
+#ifdef CONFIG_MUXERS
static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
{
NUTContext *nut = s->priv_data;
More information about the Pkg-gstreamer-maintainers
mailing list