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, 155 deletions

diff --git a/gst-libs/ext/mplex/videostrm.hh b/gst-libs/ext/mplex/videostrm.hh
deleted file mode 100644
index 6eeac476..00000000
--- a/gst-libs/ext/mplex/videostrm.hh
+++ /dev/null
@@ -1,155 +0,0 @@
-
-/*
- *  videostrm.hh:  Video stream elementary input stream
- *
- *  Copyright (C) 2001 Andrew Stevens <andrew.stevens@philips.com>
- *
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of version 2 of the GNU General Public License
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef __VIDEOSTRM_H__
-#define __VIDEOSTRM_H__
-
-#include "inputstrm.hh"
-
-class VideoStream:public ElementaryStream
-{
-public:
-  VideoStream (IBitStream & ibs, OutputStream & into);
-  void Init (const int stream_num);
-  static bool Probe (IBitStream & bs);
-
-  void Close ();
-
-  inline int AUType ()
-  {
-    return au->type;
-  }
-
-  inline bool EndSeq ()
-  {
-    return au->end_seq;
-  }
-
-  inline int NextAUType ()
-  {
-    VAunit *p_au = Lookahead ();
-
-    if (p_au != NULL)
-      return p_au->type;
-    else
-      return NOFRAME;
-  }
-
-  inline bool SeqHdrNext ()
-  {
-    VAunit *p_au = Lookahead ();
-
-    return p_au != NULL && p_au->seq_header;
-  }
-
-  virtual unsigned int NominalBitRate ()
-  {
-    return bit_rate * 50;
-  }
-
-  virtual void OutputGOPControlSector ();
-  bool RunOutComplete ();
-  virtual bool MuxPossible (clockticks currentSCR);
-  void SetMaxStdBufferDelay (unsigned int demux_rate);
-  void OutputSector ();
-
-protected:
-  void OutputSeqhdrInfo ();
-  virtual bool AUBufferNeedsRefill ();
-  virtual void FillAUbuffer (unsigned int frames_to_buffer);
-  virtual void InitAUbuffer ();
-  virtual void NextDTSPTS (clockticks & DTS, clockticks & PTS);
-  void ScanFirstSeqHeader ();
-  uint8_t NewAUTimestamps (int AUtype);
-  bool NewAUBuffers (int AUtype);
-
-public:
-  unsigned int num_sequence;
-  unsigned int num_seq_end;
-  unsigned int num_pictures;
-  unsigned int num_groups;
-  unsigned int num_frames[4];
-  unsigned int avg_frames[4];
-
-  unsigned int horizontal_size;
-  unsigned int vertical_size;
-  unsigned int aspect_ratio;
-  unsigned int picture_rate;
-  unsigned int bit_rate;
-  unsigned int comp_bit_rate;
-  unsigned int peak_bit_rate;
-  unsigned int vbv_buffer_size;
-  unsigned int CSPF;
-  double secs_per_frame;
-
-
-  bool dtspts_for_all_au;
-  bool gop_control_packet;
-
-protected:
-
-  /* State variables for scanning source bit-stream */
-  VAunit access_unit;
-  unsigned int fields_presented;
-  unsigned int group_order;
-  unsigned int group_start_pic;
-  unsigned int group_start_field;
-  int temporal_reference;
-  unsigned int pict_rate;
-  unsigned int pict_struct;
-  int pulldown_32;
-  int repeat_first_field;
-  int prev_temp_ref;
-  double frame_rate;
-  unsigned int max_bits_persec;
-  int AU_pict_data;
-  int AU_hdr;
-  clockticks max_PTS;
-  clockticks max_STD_buffer_delay;
-
-  int opt_mpeg;
-  int opt_multifile_segment;
-};
-
-//
-// DVD's generate control sectors for each GOP...
-//
-
-class DVDVideoStream:public VideoStream
-{
-public:
-  DVDVideoStream (IBitStream & ibs, OutputStream & into):VideoStream (ibs, into)
-  {
-    gop_control_packet = true;
-  }
-  void OutputGOPControlSector ();
-};
-
-#endif // __INPUTSTRM_H__
-
-
-/* 
- * Local variables:
- *  c-file-style: "stroustrup"
- *  tab-width: 4
- *  indent-tabs-mode: nil
- * End:
- */