From 09b8d9402fc6039b60358b529b4afdaddc4a72d4 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 21:57:13 +0000 Subject: Pass a proper va_list type to vsscanf() test in configure. This fixes the check on SuperH with CodeSourcery compilers. patch by Bill Traynor, wmat naoi ca git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30219 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index ce8aecb127..108ba52a45 100755 --- a/configure +++ b/configure @@ -3745,7 +3745,7 @@ cat > $TMPC << EOF #define _ISOC99_SOURCE #include #include -int main(void) { vsscanf(0, 0, 0); return 0; } +int main(void) { va_list ap; vsscanf(0, 0, ap); return 0; } EOF _vsscanf=no cc_check && _vsscanf=yes -- cgit v1.2.3 From ff44ac1a3c5e8cfde01c58e493ff12880ecc748b Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:28:44 +0000 Subject: Pass proper parameters to dlopen/dlsym/vsscanf to avoid configure test warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30220 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 108ba52a45..7f1437e0b6 100755 --- a/configure +++ b/configure @@ -3377,7 +3377,7 @@ echocheck "dynamic loader" cat > $TMPC << EOF #include #include -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 @@ -3745,7 +3745,7 @@ cat > $TMPC << EOF #define _ISOC99_SOURCE #include #include -int main(void) { va_list ap; vsscanf(0, 0, ap); return 0; } +int main(void) { va_list ap; vsscanf("foo", "bar", ap); return 0; } EOF _vsscanf=no cc_check && _vsscanf=yes -- cgit v1.2.3 From 22298a8e570b35e9626b22020ce70fa1f89b4220 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:29:55 +0000 Subject: Remove pointless printf call in libmp3lame test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30221 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 7f1437e0b6..a02c1ac0a4 100755 --- a/configure +++ b/configure @@ -7489,7 +7489,7 @@ if test "$_mp3lame" = auto ; then cat > $TMPC < 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 -- cgit v1.2.3 From e4ce50305bb4985005ff9e7e0d03c1cf8516bee7 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:30:41 +0000 Subject: Add missing stdlib.h #include to fribidi check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30222 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index a02c1ac0a4..f4d9452c30 100755 --- a/configure +++ b/configure @@ -6256,6 +6256,7 @@ _ld_tmp="" if test "$_fribidi" = auto ; then cat > $TMPC << EOF #include +#include /* workaround for fribidi 0.10.4 and below */ #define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8 #include -- cgit v1.2.3 From c202adb9f46dcf4ffeff4f508b7e32957fdf24f6 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 22:32:28 +0000 Subject: Remove pointless variable declaration from DirectFB check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30223 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f4d9452c30..8ca9c0d645 100755 --- a/configure +++ b/configure @@ -4138,7 +4138,7 @@ if test "$_directfb" = auto ; then _directfb=no cat > $TMPC < -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 -- cgit v1.2.3 From cec22660c74458277718795a262d0e05120fc864 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 5 Jan 2010 05:43:33 +0000 Subject: Change license terms for matrixview to GPLv2 "or later", all known authors have agreed to it, and current upstream (matrixgl.sourceforge.net) was already relicensed as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30224 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/matrixview.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 * * 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 -- cgit v1.2.3 From 46206e2b28860461af3a7b870ca97038357bfc5a Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 5 Jan 2010 10:52:12 +0000 Subject: vo_png now depends on libavcodec, not libpng. patch by Emanuele Giaquinta, emanuele.giaquinta gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30225 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/video_out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvo/video_out.c b/libvo/video_out.c index 98fa949f52..6db664af40 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -265,7 +265,7 @@ const vo_functions_t* const video_out_drivers[] = #ifdef CONFIG_YUV4MPEG &video_out_yuv4mpeg, #endif -#ifdef CONFIG_PNG +#ifdef CONFIG_LIBAVCODEC &video_out_png, #endif #ifdef CONFIG_JPEG -- cgit v1.2.3 From f80ece49a89ceceb4ae3f81f8026fc9858dab291 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 5 Jan 2010 10:54:41 +0000 Subject: Move MatrixView video output check below OpenGL check, it depends on OpenGL. patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30226 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 8ca9c0d645..de0f8e33a3 100755 --- a/configure +++ b/configure @@ -4607,19 +4607,6 @@ else fi echores "$_mga" -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 "xmga" if test "$_xmga" = auto ; then _xmga=no @@ -4983,6 +4970,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 -- cgit v1.2.3 From 4d213f46a892707b4dc0111420be2a880b131c6e Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 5 Jan 2010 19:12:25 +0000 Subject: add three ADV1 binary codecs to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30227 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index c0d88cc42c..a917d4f8af 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2399,6 +2399,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 -- cgit v1.2.3 From 41486125799e648ca07b1c4c237664d19e19db8e Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 5 Jan 2010 20:04:44 +0000 Subject: add blox binary codec to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30228 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index a917d4f8af..a52064b702 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -2192,6 +2192,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?" -- cgit v1.2.3 From 3dfee062b1deea85676710aa1b559b6d1ee81c47 Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 5 Jan 2010 20:12:06 +0000 Subject: map zjpeg to ffmjpeg in codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30229 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index a52064b702..0cb203e2b2 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 -- cgit v1.2.3 From c94c8d30812bdec972f64b94c3e77823830a0490 Mon Sep 17 00:00:00 2001 From: compn Date: Wed, 6 Jan 2010 03:44:24 +0000 Subject: add MVLZ and MVDV binary decoders to codecs.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30230 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/etc/codecs.conf b/etc/codecs.conf index 0cb203e2b2..74043f6aff 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -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 -- cgit v1.2.3 From abb06b3f11714de8b59f2482a9aec6447653f997 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 6 Jan 2010 16:11:29 +0000 Subject: Simplify ffmpeg stream support, we (so far) do not need any special option parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30231 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_ffmpeg.c | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index c681dc2c88..6dee2fcceb 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_complete(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; } @@ -135,6 +109,6 @@ const stream_info_t stream_info_ffmpeg = { "", open_f, { "ffmpeg", NULL }, - &stream_opts, + NULL, 1 // Urls are an option string }; -- cgit v1.2.3 From 78267a4d210cd374c49aa6a56f8e3a16e0aad4b5 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 6 Jan 2010 16:12:58 +0000 Subject: Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp:// git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c index 6dee2fcceb..6aee8c63ee 100644 --- a/stream/stream_ffmpeg.c +++ b/stream/stream_ffmpeg.c @@ -108,7 +108,7 @@ const stream_info_t stream_info_ffmpeg = { "", "", open_f, - { "ffmpeg", NULL }, + { "ffmpeg", "rtmp", NULL }, NULL, 1 // Urls are an option string }; -- cgit v1.2.3 From 554231067da1c2aaa65639b62fed3ee0b89667c6 Mon Sep 17 00:00:00 2001 From: zuxy Date: Thu, 7 Jan 2010 04:59:50 +0000 Subject: Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30233 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index ded6feb4f8..1a6290c988 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -207,6 +207,8 @@ void mp_msp_av_log_callback(void *ptr, int level, const char *fmt, va_list vl) 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; -- cgit v1.2.3 From 0c7fcdd42e6ad557a4ab63d4ef4191401cdac4a8 Mon Sep 17 00:00:00 2001 From: zuxy Date: Thu, 7 Jan 2010 07:13:18 +0000 Subject: Remove const to avoid a bunch of GCC warnings against discarded qualifiers and incompatible pointer type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30234 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/x86/yuv2rgb_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/yuv2rgb_template.c b/libswscale/x86/yuv2rgb_template.c index e4a1a9809b..aa17f196bd 100644 --- a/libswscale/x86/yuv2rgb_template.c +++ b/libswscale/x86/yuv2rgb_template.c @@ -508,7 +508,7 @@ static inline int RENAME(yuva420_rgb32)(SwsContext *c, uint8_t* src[], int srcSt #endif } -static inline int RENAME(yuv420_bgr32)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static inline int RENAME(yuv420_bgr32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { int y, h_size; @@ -525,7 +525,7 @@ static inline int RENAME(yuv420_bgr32)(SwsContext *c, const uint8_t* src[], int YUV2RGB_OPERANDS } -static inline int RENAME(yuva420_bgr32)(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, +static inline int RENAME(yuva420_bgr32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t* dst[], int dstStride[]) { #if HAVE_7REGS -- cgit v1.2.3 From 0d3adaac4b00282b2bad126d4be07d093d22ceb3 Mon Sep 17 00:00:00 2001 From: zuxy Date: Thu, 7 Jan 2010 11:12:58 +0000 Subject: Happy new year! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30235 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/mplayer.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index 0df832f830..9014d37ca7 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" -- cgit v1.2.3 From 3f1a03feb15344188a8213854246d42db38314ac Mon Sep 17 00:00:00 2001 From: stefano Date: Thu, 7 Jan 2010 19:07:47 +0000 Subject: Implement sws_isSupportedInput() and sws_isSupportedOutput(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30236 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 12 ++++++++++++ libswscale/swscale.h | 16 ++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index c19b0b74f6..f4a65b2c85 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -157,6 +157,12 @@ const char *swscale_license(void) || (x)==PIX_FMT_YUV422P16BE \ || (x)==PIX_FMT_YUV444P16BE \ ) + +int sws_isSupportedInput(enum PixelFormat pix_fmt) +{ + return isSupportedIn(pix_fmt); +} + #define isSupportedOut(x) ( \ (x)==PIX_FMT_YUV420P \ || (x)==PIX_FMT_YUVA420P \ @@ -181,6 +187,12 @@ const char *swscale_license(void) || (x)==PIX_FMT_YUV422P16BE \ || (x)==PIX_FMT_YUV444P16BE \ ) + +int sws_isSupportedOutput(enum PixelFormat pix_fmt) +{ + return isSupportedOut(pix_fmt); +} + #define isPacked(x) ( \ (x)==PIX_FMT_PAL8 \ || (x)==PIX_FMT_YUYV422 \ diff --git a/libswscale/swscale.h b/libswscale/swscale.h index d4761d0692..958d0244ae 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBSWSCALE_VERSION_MAJOR 0 -#define LIBSWSCALE_VERSION_MINOR 7 -#define LIBSWSCALE_VERSION_MICRO 2 +#define LIBSWSCALE_VERSION_MINOR 8 +#define LIBSWSCALE_VERSION_MICRO 0 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ @@ -122,6 +122,18 @@ typedef struct { struct SwsContext; +/** + * Returns a positive value if pix_fmt is a supported input format, 0 + * otherwise. + */ +int sws_isSupportedInput(enum PixelFormat pix_fmt); + +/** + * Returns a positive value if pix_fmt is a supported output format, 0 + * otherwise. + */ +int sws_isSupportedOutput(enum PixelFormat pix_fmt); + /** * Frees the swscaler context swsContext. * If swsContext is NULL, then does nothing. -- cgit v1.2.3