summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ae.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-10-31 00:04:18 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:55 +0200
commit389c32b5c72897a8b1b3c929c8f278e8980f2290 (patch)
tree47f7784ec12f9d53172f7ad326ed78f2f9889f74 /libmpcodecs/ae.c
parent8939645dcf39c398e1b70b851b3410299ca619ce (diff)
downloadmpv-389c32b5c72897a8b1b3c929c8f278e8980f2290.tar.bz2
mpv-389c32b5c72897a8b1b3c929c8f278e8980f2290.tar.xz
Remove MEncoder
Disable MEncoder compilation and remove files used by MEncoder only. There's no attempt to remove all references to MEncoder from the build system, documentation etc at this point. Removed files: (muxers, audio/video encoders, misc) mencoder.c cfg-mencoder.h parser-mecmd.[ch] xvid_vbr.[ch] libmpdemux/muxer* libmpcodecs/ae* libmpcodecs/ve* libmpcodecs/native/rtjpegn.[ch] libmpcodecs/native/mmx.h // was used by rtjpegn only Rationale: MEncoder is still useful for some people, but there's not much potential for further development; in the long run almost all use cases can be handled better by solutions based on something else (for example using FFmpeg or encoding MPlayer output). FFmpeg is already getting video filtering support which should work for some common MEncoder uses. Keeping MEncoder working takes extra work that is away from player development. While that amount of work is not huge (mostly MEncoder can be just ignored), it's not completely insignificant either. MEncoder is still maintained to some degree in the svn tree, so if necessary it's possible to use it from there for now. This tree has never had major improvements for the MEncoder side, so using svn MEncoder instead should be no major loss.
Diffstat (limited to 'libmpcodecs/ae.c')
-rw-r--r--libmpcodecs/ae.c116
1 files changed, 0 insertions, 116 deletions
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c
deleted file mode 100644
index 1669359981..0000000000
--- a/libmpcodecs/ae.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <math.h>
-#include "config.h"
-#include "libmpdemux/aviheader.h"
-#include "libmpdemux/ms_hdr.h"
-#include "stream/stream.h"
-#include "libmpdemux/muxer.h"
-#include "ae.h"
-
-#include "ae_pcm.h"
-
-#ifdef CONFIG_TOOLAME
-#include "ae_toolame.h"
-#endif
-
-#ifdef CONFIG_MP3LAME
-#include "ae_lame.h"
-#endif
-
-#ifdef CONFIG_LIBAVCODEC
-#include "ae_lavc.h"
-#endif
-
-#ifdef CONFIG_FAAC
-#include "ae_faac.h"
-#endif
-
-#ifdef CONFIG_TWOLAME
-#include "ae_twolame.h"
-#endif
-
-audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params)
-{
- int ris;
- audio_encoder_t *encoder;
- if(! params)
- return NULL;
-
- encoder = calloc(1, sizeof(audio_encoder_t));
- memcpy(&encoder->params, params, sizeof(audio_encoding_params_t));
- encoder->stream = stream;
-
- switch(stream->codec)
- {
- case ACODEC_PCM:
- ris = mpae_init_pcm(encoder);
- break;
-#ifdef CONFIG_TOOLAME
- case ACODEC_TOOLAME:
- ris = mpae_init_toolame(encoder);
- break;
-#endif
-#ifdef CONFIG_LIBAVCODEC
- case ACODEC_LAVC:
- ris = mpae_init_lavc(encoder);
- break;
-#endif
-#ifdef CONFIG_MP3LAME
- case ACODEC_VBRMP3:
- ris = mpae_init_lame(encoder);
- break;
-#endif
-#ifdef CONFIG_FAAC
- case ACODEC_FAAC:
- ris = mpae_init_faac(encoder);
- break;
-#endif
-#ifdef CONFIG_TWOLAME
- case ACODEC_TWOLAME:
- ris = mpae_init_twolame(encoder);
- break;
-#endif
- default:
- ris = 0;
- break;
- }
-
- if(! ris)
- {
- free(encoder);
- return NULL;
- }
- encoder->bind(encoder, stream);
- encoder->decode_buffer = malloc(encoder->decode_buffer_size);
- if(! encoder->decode_buffer)
- {
- free(encoder);
- return NULL;
- }
-
- encoder->codec = stream->codec;
- return encoder;
-}