configure.ac: Fix configure check for mpeg2enc. We need 1.6.1.93 instead of 1.6.1.92, since the pkg-config file of 1....

Original commit message from CVS:
2004-01-01  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* configure.ac:
Fix configure check for mpeg2enc. We need 1.6.1.93 instead of
1.6.1.92, since the pkg-config file of 1.6.1.92 is borked and
it therefore uses the wrong include paths. Too bad... Note
that 1.6.1.93 is not release yet. ;).
Also add a check for mplex, which is now using the lib'ified
mplex from mjpegtools, too.
* ext/ffmpeg/gstffmpegcodecmap.c:
Add codec_tag for 3ivx/xvid. For xvid, this should fix playback
issues. I don't think ffmpeg handles 3ivx correctly, so this
probably won't work. But it won't hurt either.
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect),
(gst_ffmpegdec_chain):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect),
(gst_ffmpegenc_chain_audio):
Fix memleak in audio encoding. Close codec if open fails, this
calls the cleanup routines so we can re-use the context.
* ext/mpeg2enc/gstmpeg2enc.cc:
Fix pad template names/types, fix memory issue with getcaps().
* ext/mpeg2enc/gstmpeg2encoder.cc:
* ext/mpeg2enc/gstmpeg2encoder.hh:
Fix compile issue with new caps system (const thingy).
* ext/mpeg2enc/gstmpeg2encpicturereader.cc:
* ext/mpeg2enc/gstmpeg2encpicturereader.hh:
We read a first frame right on initing, so that we have a caps
when we init the output. This caps is cached in padprivate and
read as first frame.
* ext/mplex/Makefile.am:
* ext/mplex/gstmplex.cc:
* ext/mplex/gstmplex.h:
* ext/mplex/gstmplex.hh:
* ext/mplex/gstmplexibitstream.cc:
* ext/mplex/gstmplexibitstream.hh:
* ext/mplex/gstmplexjob.cc:
* ext/mplex/gstmplexjob.hh:
* ext/mplex/gstmplexoutputstream.cc:
* ext/mplex/gstmplexoutputstream.hh:
We wrap mjpegtools mplex. So I rewrote the plugin. The old plugin
had issues, didn't do capsnego, supported only a subset of the
mplex features and required a mplex fork in our local CVS. Plus
that it worked agaist a very old mplex version. Rewriting was
faster than updating it.
* gst-libs/ext/Makefile.am:
* gst-libs/ext/mplex/INSTRUCT:
* gst-libs/ext/mplex/Makefile.am:
* gst-libs/ext/mplex/README:
* gst-libs/ext/mplex/TODO:
* gst-libs/ext/mplex/ac3strm_in.cc:
* gst-libs/ext/mplex/audiostrm.hh:
* gst-libs/ext/mplex/audiostrm_out.cc:
* gst-libs/ext/mplex/aunit.hh:
* gst-libs/ext/mplex/bits.cc:
* gst-libs/ext/mplex/bits.hh:
* gst-libs/ext/mplex/buffer.cc:
* gst-libs/ext/mplex/buffer.hh:
* gst-libs/ext/mplex/fastintfns.h:
* gst-libs/ext/mplex/format_codes.h:
* gst-libs/ext/mplex/inputstrm.cc:
* gst-libs/ext/mplex/inputstrm.hh:
* gst-libs/ext/mplex/lpcmstrm_in.cc:
* gst-libs/ext/mplex/mjpeg_logging.cc:
* gst-libs/ext/mplex/mjpeg_logging.h:
* gst-libs/ext/mplex/mjpeg_types.h:
* gst-libs/ext/mplex/mpastrm_in.cc:
* gst-libs/ext/mplex/mpegconsts.cc:
* gst-libs/ext/mplex/mpegconsts.h:
* gst-libs/ext/mplex/mplexconsts.hh:
* gst-libs/ext/mplex/multplex.cc:
* gst-libs/ext/mplex/outputstream.hh:
* gst-libs/ext/mplex/padstrm.cc:
* gst-libs/ext/mplex/padstrm.hh:
* gst-libs/ext/mplex/stillsstream.cc:
* gst-libs/ext/mplex/stillsstream.hh:
* gst-libs/ext/mplex/systems.cc:
* gst-libs/ext/mplex/systems.hh:
* gst-libs/ext/mplex/vector.cc:
* gst-libs/ext/mplex/vector.hh:
* gst-libs/ext/mplex/videostrm.hh:
* gst-libs/ext/mplex/videostrm_in.cc:
* gst-libs/ext/mplex/videostrm_out.cc:
* gst-libs/ext/mplex/yuv4mpeg.cc:
* gst-libs/ext/mplex/yuv4mpeg.h:
* gst-libs/ext/mplex/yuv4mpeg_intern.h:
* gst-libs/ext/mplex/yuv4mpeg_ratio.cc:
We don't fork mjpegtools' mplex in our CVS anymore.
* gst/avi/gstavidemux.c: (gst_avi_demux_src_getcaps),
(gst_avi_demux_add_stream):
* gst/avi/gstavidemux.h:
Add getcaps() function for proper caps nego. This makes some
parts of AVI playback/reading work.
* sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect):
Resize window on new capsnego. This is probably wrong, but
I'm still committing it because with current capsnego, the
first successfull capsnego is auto-fixated, therefore rounded
down to the lowest values in the caps. this results in a 16x16
XWindow that is not reized when real capsnego finishes.
Dave, I see more cases of this, do you know a proper solution?
* tools/gst-launch-ext.in:
Fix MPEG-4 AAC (Apple iPod/iTunes) file commandline.

1 files changed, 0 insertions, 83 deletions

diff --git a/gst-libs/ext/mplex/mplexconsts.hh b/gst-libs/ext/mplex/mplexconsts.hh
deleted file mode 100644
index c3fe6ce1..00000000
--- a/gst-libs/ext/mplex/mplexconsts.hh
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef __MPLEXCONSTS_H__
-#define __MPLEXCONSTS_H__
-
-
-#define SEQUENCE_HEADER 	0x000001b3
-#define SEQUENCE_END		0x000001b7
-#define PICTURE_START		0x00000100
-#define EXT_START_CODE 0x000001b5
-#define GROUP_START		0x000001b8
-#define SYNCWORD_START		0x000001
-
-#define IFRAME                  1
-#define PFRAME                  2
-#define BFRAME                  3
-#define DFRAME                  4
-#define NOFRAME                 5
-
-#define PIC_TOP_FIELD 1
-#define PIC_BOT_FIELD 2
-#define PIC_FRAME 3
-
-#define CODING_EXT_ID       8
-#define AUDIO_SYNCWORD		0x7ff
-
-
-#define PACK_START		0x000001ba
-#define SYS_HEADER_START	0x000001bb
-#define ISO11172_END		0x000001b9
-#define PACKET_START		0x000001
-
-#define MAX_FFFFFFFF		4294967295.0	/* = 0xffffffff in dec. */
-
-#define CLOCKS_per_90Kth_sec 300
-
-#define CLOCKS			(CLOCKS_per_90Kth_sec*90000)
-/* MPEG-2 System Clock Hertz - we divide down by 300.0 for MPEG-1*/
-
-/* Range of sizes of the fields following the packet length field in packet header:
-	used to calculate if recieve buffers will have enough space... */
-
-#define MPEG2_BUFFERINFO_LENGTH 3
-#define MPEG1_BUFFERINFO_LENGTH 2
-#define DTS_PTS_TIMESTAMP_LENGTH 5
-#define MPEG2_AFTER_PACKET_LENGTH_MIN    3
-#define MPEG1_AFTER_PACKET_LENGTH_MIN    (0+1)
-
-	/* Sector under-size below which header stuffing rather than padding packets
-	   or post-packet zero stuffing is used.  *Must* be less than 20 for VCD
-	   multiplexing to work correctly!
-	 */
-
-#define MINIMUM_PADDING_PACKET_SIZE 10
-
-#define PACKET_HEADER_SIZE	6
-
-#define AUDIO_STREAMS		0xb8	/* Marker Audio Streams */
-#define VIDEO_STREAMS		0xb9	/* Marker Video Streams */
-#define AUDIO_STR_0		0xc0	/* Marker Audio Stream0 */
-#define VIDEO_STR_0		0xe0	/* Marker Video Stream0 */
-#define PADDING_STR		0xbe	/* Marker Padding Stream */
-#define PRIVATE_STR_1   0xbd	/* private stream 1 */
-#define PRIVATE_STR_2   0xbf	/* private stream 2 */
-#define AC3_SUB_STR_0   0x80	/* AC3 substream id 0 */
-
-#define LPCM_SUB_STR_0  0xa0	/* LPCM substream id 0 */
-
-#define ZERO_STUFFING_BYTE	0
-#define STUFFING_BYTE		0xff
-#define RESERVED_BYTE		0xff
-#define TIMESTAMPBITS_NO		0	/* Flag NO timestamps   */
-#define TIMESTAMPBITS_PTS		2	/* Flag PTS timestamp   */
-#define TIMESTAMPBITS_DTS		1	/* Flag PTS timestamp   */
-#define TIMESTAMPBITS_PTS_DTS	(TIMESTAMPBITS_DTS|TIMESTAMPBITS_PTS)	/* Flag BOTH timestamps */
-
-#define MARKER_MPEG1_SCR		2	/* Marker SCR           */
-#define MARKER_MPEG2_SCR        1	/* These don't need to be distinct! */
-#define MARKER_JUST_PTS			2	/* Marker only PTS      */
-#define MARKER_PTS				3	/* Marker PTS           */
-#define MARKER_DTS				1	/* Marker DTS           */
-#define MARKER_NO_TIMESTAMPS	0x0f	/* Marker NO timestamps */
-
-
-#endif // __MPLEXCONSTS_H__