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

diff --git a/gst-libs/ext/mplex/yuv4mpeg_intern.h b/gst-libs/ext/mplex/yuv4mpeg_intern.h
deleted file mode 100644
index 140f9d62..00000000
--- a/gst-libs/ext/mplex/yuv4mpeg_intern.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  yuv4mpeg_intern.h:  Internal constants for "new" YUV4MPEG streams
- *
- *  Copyright (C) 2001 Andrew Stevens <andrew.stevens@philips.com>
- *  Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.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 __YUV4MPEG_INTERN_H__
-#define __YUV4MPEG_INTERN_H__
-
-
-#define Y4M_MAGIC "YUV4MPEG2"
-#define Y4M_FRAME_MAGIC "FRAME"
-
-#define Y4M_DELIM " "  /* single-character(space) separating tagged fields */
-
-#define Y4M_LINE_MAX 256   /* max number of characters in a header line
-                               (including the '\n', but not the '\0') */
-
-
-/* standard framerate ratios */
-#define Y4M_FPS_UNKNOWN    { 0, 0 }
-#define Y4M_FPS_NTSC_FILM  { 24000, 1001 }
-#define Y4M_FPS_FILM       { 24, 1 }
-#define Y4M_FPS_PAL        { 25, 1 }
-#define Y4M_FPS_NTSC       { 30000, 1001 }
-#define Y4M_FPS_30         { 30, 1 }
-#define Y4M_FPS_PAL_FIELD  { 50, 1 }
-#define Y4M_FPS_NTSC_FIELD { 60000, 1001 }
-#define Y4M_FPS_60         { 60, 1 }
-
-/* standard sample/pixel aspect ratios */
-#define Y4M_SAR_UNKNOWN        {   0, 0  }
-#define Y4M_SAR_SQUARE         {   1, 1  }
-#define Y4M_SAR_SQR_ANA_16_9   {   4, 3  }
-#define Y4M_SAR_NTSC_CCIR601   {  10, 11 }
-#define Y4M_SAR_NTSC_16_9      {  40, 33 }
-#define Y4M_SAR_NTSC_SVCD_4_3  {  15, 11 }
-#define Y4M_SAR_NTSC_SVCD_16_9 {  20, 11 }
-#define Y4M_SAR_PAL_CCIR601    {  59, 54 }
-#define Y4M_SAR_PAL_16_9       { 118, 81 }
-#define Y4M_SAR_PAL_SVCD_4_3   {  59, 36 }
-#define Y4M_SAR_PAL_SVCD_16_9  {  59, 27 }
-
-#define Y4M_SAR_MPEG1_1 Y4M_SAR_SQUARE
-#define Y4M_SAR_MPEG1_2  { 10000, 6735 }
-#define Y4M_SAR_MPEG1_3  { 10000, 7031 } /* Anamorphic 16:9 PAL */
-#define Y4M_SAR_MPEG1_4  { 10000, 7615 }
-#define Y4M_SAR_MPEG1_5  { 10000, 8055 }
-#define Y4M_SAR_MPEG1_6  { 10000, 8437 } /* Anamorphic 16:9 NTSC */
-#define Y4M_SAR_MPEG1_7  { 10000, 8935 } 
-#define Y4M_SAR_MPEG1_8  { 10000, 9375 } /* PAL/SECAM 4:3 */
-#define Y4M_SAR_MPEG1_9  { 10000, 9815 }
-#define Y4M_SAR_MPEG1_10 { 10000, 10255 }
-#define Y4M_SAR_MPEG1_11 { 10000, 10695 }
-#define Y4M_SAR_MPEG1_12 { 10000, 11250 } /* NTSC 4:3 */
-#define Y4M_SAR_MPEG1_13 { 10000, 11575 }
-#define Y4M_SAR_MPEG1_14 { 10000, 12015 }
-
-#define Y4M_DAR_UNKNOWN        {   0, 0  }
-#define Y4M_DAR_4_3      {   4, 3   }
-#define Y4M_DAR_16_9     {  16, 9   }
-#define Y4M_DAR_221_100  { 221, 100 }
-
-#define Y4M_DAR_MPEG2_1 {   1, 1   }
-#define Y4M_DAR_MPEG2_2 {   4, 3   }
-#define Y4M_DAR_MPEG2_3 {  16, 9   }
-#define Y4M_DAR_MPEG2_4 { 221, 100 }
-
-#endif /* __YUV4MPEG_INTERN_H__ */
-