diff options
| -rwxr-xr-x | configure | 36 | ||||
| -rw-r--r-- | etc/codecs.conf | 50 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
| -rw-r--r-- | libvo/matrixview.c | 5 | ||||
| -rw-r--r-- | libvo/video_out.c | 2 | ||||
| -rw-r--r-- | osdep/mplayer.rc | 2 | ||||
| -rw-r--r-- | stream/stream_ffmpeg.c | 34 |
7 files changed, 79 insertions, 52 deletions
@@ -3281,7 +3281,7 @@ echocheck "dynamic loader" cat > $TMPC << EOF #include <stddef.h> #include <dlfcn.h> -int main(void) { dlopen(NULL, 0); dlclose(NULL); dlsym(NULL, NULL); return 0; } +int main(void) { dlopen("", 0); dlclose(NULL); dlsym(NULL, ""); return 0; } EOF _dl=no for _ld_tmp in "" "-ldl" ; do @@ -3649,7 +3649,7 @@ cat > $TMPC << EOF #define _ISOC99_SOURCE #include <stdarg.h> #include <stdio.h> -int main(void) { vsscanf(0, 0, 0); return 0; } +int main(void) { va_list ap; vsscanf("foo", "bar", ap); return 0; } EOF _vsscanf=no cc_check && _vsscanf=yes @@ -4042,7 +4042,7 @@ if test "$_directfb" = auto ; then _directfb=no cat > $TMPC <<EOF #include <directfb.h> -int main(void) { IDirectFB *foo; DirectFBInit(0,0); return 0; } +int main(void) { DirectFBInit(0, 0); return 0; } EOF for _inc_tmp in "" -I/usr/local/include/directfb \ -I/usr/include/directfb -I/usr/local/include; do @@ -4492,19 +4492,6 @@ else _novomodules="xvidix $_novomodules" fi -echocheck "MatrixView" -if test "$_gl" = no ; then - matrixview=no -fi -if test "$matrixview" = yes ; then - _vomodules="matrixview $_vomodules" - def_matrixview='#define CONFIG_MATRIXVIEW 1' -else - _novomodules="matrixview $_novomodules" - def_matrixview='#undef CONFIG_MATRIXVIEW' -fi -echores "$matrixview" - echocheck "GGI" if test "$_ggi" = auto ; then cat > $TMPC << EOF @@ -4853,6 +4840,20 @@ fi echores "$_gl" +echocheck "MatrixView" +if test "$_gl" = no ; then + matrixview=no +fi +if test "$matrixview" = yes ; then + _vomodules="matrixview $_vomodules" + def_matrixview='#define CONFIG_MATRIXVIEW 1' +else + _novomodules="matrixview $_novomodules" + def_matrixview='#undef CONFIG_MATRIXVIEW' +fi +echores "$matrixview" + + echocheck "PNG support" if test "$_png" = auto ; then _png=no @@ -6093,6 +6094,7 @@ _ld_tmp="" if test "$_fribidi" = auto ; then cat > $TMPC << EOF #include <stdio.h> +#include <stdlib.h> /* workaround for fribidi 0.10.4 and below */ #define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8 #include <fribidi/fribidi.h> @@ -7143,7 +7145,7 @@ if test "$_mp3lame" = auto ; then cat > $TMPC <<EOF #include <lame/lame.h> int main(void) { lame_version_t lv; (void) lame_init(); - get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); + get_lame_version_numerical(&lv); return 0; } EOF cc_check -lmp3lame $_ld_lm && _mp3lame=yes diff --git a/etc/codecs.conf b/etc/codecs.conf index c0d88cc42c..74043f6aff 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1300,7 +1300,7 @@ videocodec ffmjpeg fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec fourcc avi1,avi2 - fourcc MTSJ + fourcc MTSJ,ZJPG driver ffmpeg dll mjpeg out 444P @@ -1947,6 +1947,22 @@ videocodec psiv dll "psiv.dll" out BGR32,BGR24 query,flip +videocodec midivid1 + info "http://www.midivid.com/codec/download.html" + status working + fourcc MVLZ + driver vfw + dll "MLZCodec.dll" + out BGR24,BGR16 flip + +videocodec midivid2 + info "http://www.midivid.com/codec/download.html" + status working + fourcc MVDV + driver vfw + dll "MVCodec.dll" + out BGR24 flip + videocodec midivid3 info "www.midivid.com/codec/mv3codec.html" status working @@ -2192,6 +2208,14 @@ videocodec slifvfw dll "slif.dll" out RGB32 flip +videocodec blox + info "Jan Jezabeks BLOX MPEG Codec" + status working + fourcc BLOX + driver vfw + dll "blox.dll" + out YUY2 + videocodec cjpg info "Creative Labs Video Blaster Webcam" comment "sequential jpeg files?" @@ -2399,6 +2423,30 @@ videocodec smsvvfw dll "wv32vfw.dll" out BGR24 flip +videocodec adv601 + info "Analog Devices Wavelet Codec" + status working + fourcc ADV1 + driver vfw + dll "ADV601.dll" + out BGR24 flip + +videocodec advwavelet + info "waveletvideo.freeservers.com" + status working + fourcc ADV1 + driver vfw + dll "wavelet.dll" + out BGR24 flip + +videocodec loronixwavlet + info "loronix wavelet" + status untested + fourcc ADV1 + driver vfw + dll "wavlor.dll" + out BGR24 + videocodec foxmotion info "fox motion video" status working diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 9b833dac72..83dea0b2e5 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -146,6 +146,8 @@ static int control(sh_video_t *sh, int cmd, void *arg, ...){ static void set_format_params(struct AVCodecContext *avctx, enum PixelFormat fmt){ int imgfmt; + if (fmt == PIX_FMT_NONE) + return; imgfmt = pixfmt2imgfmt(fmt); if (IMGFMT_IS_XVMC(imgfmt) || IMGFMT_IS_VDPAU(imgfmt)) { sh_video_t *sh = avctx->opaque; diff --git a/libvo/matrixview.c b/libvo/matrixview.c index de1e1ccf18..f2dff111a3 100644 --- a/libvo/matrixview.c +++ b/libvo/matrixview.c @@ -3,8 +3,9 @@ * Mucked with by Tugrul Galatali <tugrul@galatali.com> * * MatrixView is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * 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. * * MatrixView is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libvo/video_out.c b/libvo/video_out.c index 0fec6153eb..9dbe490037 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -256,7 +256,7 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_YUV4MPEG &video_out_yuv4mpeg, #endif -#ifdef CONFIG_PNG +#ifdef CONFIG_LIBAVCODEC &video_out_png, #endif #ifdef CONFIG_JPEG diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index 7432b45231..7e166b9c6f 100644 --- a/osdep/mplayer.rc +++ b/osdep/mplayer.rc @@ -36,7 +36,7 @@ FILETYPE VFT_APP VALUE "FileDescription", "MPlayer - Movie Player\000" VALUE "FileVersion",VERSION VALUE "InternalName", "Counter Counter\000" - VALUE "LegalCopyright", " (C) 2000-2009 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2010 MPlayer Team\000" //VALUE "LegalTrademarks"," \000"; VALUE "OriginalFilename", "mplayer.exe\000" VALUE "ProductName", "MPlayer - The Movie Player\000" diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index 6743720ffe..1f10793511 100644 --- a/stream/stream_ffmpeg.c +++ b/stream/stream_ffmpeg.c @@ -7,28 +7,6 @@ #include "m_option.h" #include "m_struct.h" -static struct stream_priv_s { - char *filename; - char *filename2; -} stream_priv_dflts = { - NULL, NULL -}; - -#define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) -/// URL definition -static const m_option_t stream_opts_fields[] = { - {"string", ST_OFF(filename), CONF_TYPE_STRING, 0, 0 ,0, NULL}, - {"filename", ST_OFF(filename2), CONF_TYPE_STRING, 0, 0 ,0, NULL}, - {NULL} -}; - -static const struct m_struct_st stream_opts = { - "ffmpeg", - sizeof(struct stream_priv_s), - &stream_priv_dflts, - stream_opts_fields -}; - static int fill_buffer(stream_t *s, char *buffer, int max_len) { int r = url_read(s->priv, buffer, max_len); @@ -76,7 +54,6 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) { int flags = 0; const char *filename; - struct stream_priv_s *p = opts; URLContext *ctx = NULL; int res = STREAM_ERROR; int64_t size; @@ -92,10 +69,8 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) goto out; } - if (p->filename) - filename = p->filename; - else if (p->filename2) - filename = p->filename2; + if (stream->url) + filename = stream->url; else { mp_msg(MSGT_OPEN, MSGL_ERR, "[ffmpeg] No URL\n"); goto out; @@ -124,7 +99,6 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format) res = STREAM_OK; out: - m_struct_free(&stream_opts,opts); return res; } @@ -134,7 +108,7 @@ const stream_info_t stream_info_ffmpeg = { "", "", open_f, - { "ffmpeg", NULL }, - &stream_opts, + { "ffmpeg", "rtmp", NULL }, + NULL, 1 // Urls are an option string }; |