diff options
Diffstat (limited to 'libmpcodecs')
54 files changed, 15 insertions, 64 deletions
diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c index c728af0838..ca3890643d 100644 --- a/libmpcodecs/ad_acm.c +++ b/libmpcodecs/ad_acm.c @@ -14,7 +14,6 @@ static ad_info_t info = { "Win32 ACM audio decoder", "acm", - AFM_ACM, "Nick Kurshev", "avifile.sf.net", "" diff --git a/libmpcodecs/ad_alaw.c b/libmpcodecs/ad_alaw.c index d1a7e4cfe4..ca8db2768a 100644 --- a/libmpcodecs/ad_alaw.c +++ b/libmpcodecs/ad_alaw.c @@ -9,7 +9,6 @@ static ad_info_t info = { "aLaw/uLaw audio decoder", "alaw", - AFM_ALAW, "Nick Kurshev", "A'rpi", "" diff --git a/libmpcodecs/ad_dk3adpcm.c b/libmpcodecs/ad_dk3adpcm.c index 5cb6b6b232..a6b2c94639 100644 --- a/libmpcodecs/ad_dk3adpcm.c +++ b/libmpcodecs/ad_dk3adpcm.c @@ -20,7 +20,6 @@ static ad_info_t info = { "Duck DK3 ADPCM decoder", "dk3adpcm", - AFM_DK3ADPCM, "Nick Kurshev", "Mike Melanson", "This format number was used by Duck Corp. but not officially registered with Microsoft" diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c index 208a927814..662a5204db 100644 --- a/libmpcodecs/ad_dshow.c +++ b/libmpcodecs/ad_dshow.c @@ -14,7 +14,6 @@ static ad_info_t info = { "Win32/DirectShow decoders", "dshow", - AFM_DSHOW, "Nick Kurshev", "avifile.sf.net", "" diff --git a/libmpcodecs/ad_dvdpcm.c b/libmpcodecs/ad_dvdpcm.c index faab6a7584..60704c9185 100644 --- a/libmpcodecs/ad_dvdpcm.c +++ b/libmpcodecs/ad_dvdpcm.c @@ -9,7 +9,6 @@ static ad_info_t info = { "Uncompressed DVD PCM audio decoder", "dvdpcm", - AFM_DVDPCM, "Nick Kurshev", "A'rpi", "" diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index bd210d96f9..c76257145f 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -17,7 +17,6 @@ static ad_info_t info = { "AAC (MPEG2/4 Advanced Audio Coding)", "faad", - AFM_AAC, "Felix Buenemann", "faad2", "Under development!" diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index fa642a6a95..7aac9e8418 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -16,7 +16,6 @@ static ad_info_t info = { "FFmpeg audio decoders", "ffmpeg", - AFM_FFMPEG, "Nick Kurshev", "ffmpeg.sf.net", "" diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 1b9a78d853..e645233f3c 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -20,7 +20,6 @@ static ad_info_t info = { "AC3 through SPDIF", "hwac3", - AFM_HWAC3, "Nick Kurshev", "???", "" diff --git a/libmpcodecs/ad_imaadpcm.c b/libmpcodecs/ad_imaadpcm.c index d3727e90ed..d134ae63ef 100644 --- a/libmpcodecs/ad_imaadpcm.c +++ b/libmpcodecs/ad_imaadpcm.c @@ -71,7 +71,6 @@ static ad_info_t info = { "IMA ADPCM audio decoder", "imaadpcm", - AFM_IMAADPCM, "Nick Kurshev", "Mike Melanson", "" diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index cc85fe0004..f6d6df264d 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -23,7 +23,6 @@ static ad_info_t info = { "AC3-liba52", "liba52", - AFM_A52, "Nick Kurshev", "Michel LESPINASSE", "" diff --git a/libmpcodecs/ad_libdv.c b/libmpcodecs/ad_libdv.c index 0cd5553f8b..a193369047 100644 --- a/libmpcodecs/ad_libdv.c +++ b/libmpcodecs/ad_libdv.c @@ -24,7 +24,6 @@ static ad_info_t info = { "Raw DV Audio Decoder", "libdv", - AFM_LIBDV, "Alexander Neundorf <neundorf@kde.org>", "http://libdv.sf.net", "" diff --git a/libmpcodecs/ad_libmad.c b/libmpcodecs/ad_libmad.c index 083a0942ad..5ecfd5c4f5 100644 --- a/libmpcodecs/ad_libmad.c +++ b/libmpcodecs/ad_libmad.c @@ -13,7 +13,6 @@ static ad_info_t info = { "libmad mpeg audio decoder", "libmad", - AFM_MAD, "A'rpi", "libmad...", "based on Xine's libmad/xine_decoder.c" diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index 526667ea4e..630362c829 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -12,7 +12,6 @@ static ad_info_t info = { "Ogg/Vorbis audio decoder", "libvorbis", - AFM_VORBIS, "Felix Buenemann, A'rpi", "libvorbis", "buggy" diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c index e4b8f9c4bc..ef544f465d 100644 --- a/libmpcodecs/ad_mp3lib.c +++ b/libmpcodecs/ad_mp3lib.c @@ -9,7 +9,6 @@ static ad_info_t info = { "MPEG layer-2, layer-3", "mp3lib", - AFM_MPEG, "Nick Kurshev", "mpg123", "Optimized to MMX/SSE/3Dnow!" diff --git a/libmpcodecs/ad_msadpcm.c b/libmpcodecs/ad_msadpcm.c index 7457cbc3d5..5bfa0e46fc 100644 --- a/libmpcodecs/ad_msadpcm.c +++ b/libmpcodecs/ad_msadpcm.c @@ -19,7 +19,6 @@ static ad_info_t info = { "MS ADPCM audio decoder", "msadpcm", - AFM_MSADPCM, "Nick Kurshev", "Mike Melanson", "" diff --git a/libmpcodecs/ad_msgsm.c b/libmpcodecs/ad_msgsm.c index 0aabe0aaba..a4dbe122df 100644 --- a/libmpcodecs/ad_msgsm.c +++ b/libmpcodecs/ad_msgsm.c @@ -9,7 +9,6 @@ static ad_info_t info = { "native MSGSM audio decoder", "msgsm", - AFM_GSM, "A'rpi", "XAnim", "" diff --git a/libmpcodecs/ad_pcm.c b/libmpcodecs/ad_pcm.c index e0bc8f4960..e3b3430fd5 100644 --- a/libmpcodecs/ad_pcm.c +++ b/libmpcodecs/ad_pcm.c @@ -9,7 +9,6 @@ static ad_info_t info = { "Uncompressed PCM audio decoder", "pcm", - AFM_PCM, "Nick Kurshev", "A'rpi", "" diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index 09cbbc678c..fd0511c99d 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -15,7 +15,6 @@ static ad_info_t info = { "RealAudio decoder", "realaud", - AFM_REAL, "A'rpi", "Florian Schneider", "binary real audio codecs" diff --git a/libmpcodecs/ad_roqaudio.c b/libmpcodecs/ad_roqaudio.c index 556a8bdcf5..3d6454c916 100644 --- a/libmpcodecs/ad_roqaudio.c +++ b/libmpcodecs/ad_roqaudio.c @@ -10,7 +10,6 @@ static ad_info_t info = { "Id RoQ File Audio Decoder", "roqaudio", - AFM_ROQAUDIO, "Nick Kurshev", "Mike Melanson" "RoQA is an internal MPlayer FOURCC" diff --git a/libmpcodecs/ad_sample.c b/libmpcodecs/ad_sample.c index 56d5a46dea..aa7912bba8 100644 --- a/libmpcodecs/ad_sample.c +++ b/libmpcodecs/ad_sample.c @@ -10,7 +10,6 @@ static ad_info_t info = { "Sample audio decoder", // name of the driver "sample", // driver name. should be the same as filename without ad_ - AFM_SAMPLE, // replace with registered AFM number "A'rpi", // writer/maintainer of _this_ file "", // writer/maintainer/site of the _codec_ "" // comments diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 4185415e91..af48c9136c 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -30,12 +30,13 @@ int init_audio(sh_audio_t *sh_audio) { unsigned i; for (i=0; mpcodecs_ad_drivers[i] != NULL; i++) - if(mpcodecs_ad_drivers[i]->info->id==sh_audio->codec->driver){ +// if(mpcodecs_ad_drivers[i]->info->id==sh_audio->codec->driver){ + if(!strcmp(mpcodecs_ad_drivers[i]->info->short_name,sh_audio->codec->drv)){ mpadec=mpcodecs_ad_drivers[i]; break; } if(!mpadec){ - mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_AudioCodecFamilyNotAvailable, - sh_audio->codec->name, sh_audio->codec->driver); + mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_AudioCodecFamilyNotAvailableStr, + sh_audio->codec->name, sh_audio->codec->drv); return 0; // no such driver } @@ -119,7 +120,7 @@ void uninit_audio(sh_audio_t *sh_audio) if(sh_audio->a_in_buffer) free(sh_audio->a_in_buffer); sh_audio->a_in_buffer=NULL; if(!sh_audio->inited) return; - mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_UninitAudio,sh_audio->codec->driver); + mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_UninitAudioStr,sh_audio->codec->drv); mpadec->uninit(sh_audio); sh_audio->inited=0; } diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index dc8c411476..efcd660f3e 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -134,13 +134,13 @@ int set_rectangle(sh_video_t *sh_video,int param,int value) void uninit_video(sh_video_t *sh_video){ if(!sh_video->inited) return; - mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideo,sh_video->codec->driver); + mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideoStr,sh_video->codec->drv); mpvdec->uninit(sh_video); vf_uninit_filter_chain(sh_video->vfilter); sh_video->inited=0; } -int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status){ +int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status){ unsigned int orig_fourcc=sh_video->bih?sh_video->bih->biCompression:0; sh_video->codec=NULL; sh_video->vf_inited=0; @@ -155,16 +155,17 @@ int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status){ // ok we found one codec if(sh_video->codec->flags&CODECS_FLAG_SELECTED) continue; // already tried & failed if(codecname && strcmp(sh_video->codec->name,codecname)) continue; // -vc - if(vfm>=0 && sh_video->codec->driver!=vfm) continue; // vfm doesn't match + if(vfm && strcmp(sh_video->codec->drv,vfm)) continue; // vfm doesn't match if(sh_video->codec->status<status) continue; // too unstable sh_video->codec->flags|=CODECS_FLAG_SELECTED; // tagging it // ok, it matches all rules, let's find the driver! for (i=0; mpcodecs_vd_drivers[i] != NULL; i++) - if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break; +// if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break; + if(!strcmp(mpcodecs_vd_drivers[i]->info->short_name,sh_video->codec->drv)) break; mpvdec=mpcodecs_vd_drivers[i]; if(!mpvdec){ // driver not available (==compiled in) - mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_VideoCodecFamilyNotAvailable, - sh_video->codec->name, sh_video->codec->driver); + mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_VideoCodecFamilyNotAvailableStr, + sh_video->codec->name, sh_video->codec->drv); continue; } // it's available, let's try to init! diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h index 296af5ef1a..be29e8e760 100644 --- a/libmpcodecs/dec_video.h +++ b/libmpcodecs/dec_video.h @@ -3,7 +3,7 @@ extern int video_read_properties(sh_video_t *sh_video); //extern int init_video(sh_video_t *sh_video, int *pitches); -extern int init_video(sh_video_t *sh_video,char* codecname,int vfm,int status); +extern int init_video(sh_video_t *sh_video,char* codecname,char* vfm,int status); extern void uninit_video(sh_video_t *sh_video); extern int decode_video(sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame); diff --git a/libmpcodecs/mpc_info.h b/libmpcodecs/mpc_info.h index 1f527dd66d..97f90b899f 100644 --- a/libmpcodecs/mpc_info.h +++ b/libmpcodecs/mpc_info.h @@ -7,8 +7,6 @@ typedef struct mp_codec_info_s const char *name; /* short name (same as driver name in codecs.conf) ("dshow") */ const char *short_name; - /* codec family: -vfm id */ - const int id; /* interface author/maintainer */ const char *maintainer; /* codec author ("Aaron Holtzman <aholtzma@ess.engr.uvic.ca>") */ diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 213ca4b91c..56e34d8aec 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -50,7 +50,7 @@ extern vd_functions_t mpcodecs_vd_libmpeg2; extern vd_functions_t mpcodecs_vd_huffyuv; extern vd_functions_t mpcodecs_vd_zlib; extern vd_functions_t mpcodecs_vd_mpegpes; -extern vd_functions_t mpcodecs_vd_real; +extern vd_functions_t mpcodecs_vd_realvid; extern vd_functions_t mpcodecs_vd_svq1; extern vd_functions_t mpcodecs_vd_xvid; extern vd_functions_t mpcodecs_vd_libdv; @@ -100,7 +100,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #endif &mpcodecs_vd_mpegpes, #ifdef USE_REALCODECS - &mpcodecs_vd_real, + &mpcodecs_vd_realvid, #endif &mpcodecs_vd_svq1, #ifdef HAVE_XVID diff --git a/libmpcodecs/vd_cinepak.c b/libmpcodecs/vd_cinepak.c index ac96918188..b88de90c89 100644 --- a/libmpcodecs/vd_cinepak.c +++ b/libmpcodecs/vd_cinepak.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Cinepak Video decoder", "cinepak", - VFM_CINEPAK, "A'rpi", "Dr. Tim Ferguson, http://www.csse.monash.edu.au/~timf/videocodec.html", "native codec" diff --git a/libmpcodecs/vd_cyuv.c b/libmpcodecs/vd_cyuv.c index b9500a63a2..1b1f9399d9 100644 --- a/libmpcodecs/vd_cyuv.c +++ b/libmpcodecs/vd_cyuv.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Creative YUV decoder", "cyuv", - VFM_CYUV, "A'rpi", "Dr. Tim Ferguson", "native codec" diff --git a/libmpcodecs/vd_divx4.c b/libmpcodecs/vd_divx4.c index c775bc3765..f6c264b0ca 100644 --- a/libmpcodecs/vd_divx4.c +++ b/libmpcodecs/vd_divx4.c @@ -19,7 +19,6 @@ static vd_info_t info = { "DivX4Linux lib (divx4 mode)", #endif "divx4", - VFM_DIVX4, "A'rpi", "http://www.divx.com", "native codecs" diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c index ed5618a5ba..03c027c89b 100644 --- a/libmpcodecs/vd_dshow.c +++ b/libmpcodecs/vd_dshow.c @@ -15,7 +15,6 @@ static vd_info_t info = { "DirectShow video codecs", "dshow", - VFM_DSHOW, "A'rpi", "based on http://avifile.sf.net", "win32 codecs" diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 71546b3e0e..3865529975 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -16,7 +16,6 @@ static vd_info_t info = { "FFmpeg's libavcodec codec family", "ffmpeg", - VFM_FFMPEG, "A'rpi", "http://ffmpeg.sf.net", "native codecs" diff --git a/libmpcodecs/vd_fli.c b/libmpcodecs/vd_fli.c index 0baea4f8d8..0d81aeb77d 100644 --- a/libmpcodecs/vd_fli.c +++ b/libmpcodecs/vd_fli.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Autodesk FLI/FLC Animation decoder", "fli", - VFM_FLI, "A'rpi", "Mike Melanson", "native codec" diff --git a/libmpcodecs/vd_huffyuv.c b/libmpcodecs/vd_huffyuv.c index 3935e90591..ef845a4874 100644 --- a/libmpcodecs/vd_huffyuv.c +++ b/libmpcodecs/vd_huffyuv.c @@ -28,7 +28,6 @@ static vd_info_t info = { "HuffYUV Video decoder", "huffyuv", - VFM_HUFFYUV, "Roberto Togni", "Roberto Togni", "native codec, original win32 by Ben Rudiak-Gould http://www.math.berkeley.edu/~benrg/huffyuv.html" diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c index 3bdbc26622..a7ab9d0368 100644 --- a/libmpcodecs/vd_ijpg.c +++ b/libmpcodecs/vd_ijpg.c @@ -20,7 +20,6 @@ static vd_info_t info = { "JPEG Images decoder", "ijpg", - VFM_IJPG, "Pontscho", "based on vd_mpng.c", "uses Indipended JPEG Group's jpeglib" diff --git a/libmpcodecs/vd_libdv.c b/libmpcodecs/vd_libdv.c index c890d550d7..795aac69e6 100644 --- a/libmpcodecs/vd_libdv.c +++ b/libmpcodecs/vd_libdv.c @@ -24,7 +24,6 @@ static vd_info_t info = { "Raw DV Video Decoder", "libdv", - VFM_LIBDV, "Alexander Neundorf <neundorf@kde.org>", "http://libdv.sf.net", "" diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 30de55112a..abbc15414a 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -10,7 +10,6 @@ static vd_info_t info = { "MPEG 1/2 Video decoder v2.0", "libmpeg2", - VFM_MPEG, "A'rpi", "Aaron & Walken", "native" diff --git a/libmpcodecs/vd_mpegpes.c b/libmpcodecs/vd_mpegpes.c index 94a954729b..97e5adcbef 100644 --- a/libmpcodecs/vd_mpegpes.c +++ b/libmpcodecs/vd_mpegpes.c @@ -10,7 +10,6 @@ static vd_info_t info = { "MPEG 1/2 Video passthrough", "mpegpes", - VFM_MPEGPES, "A'rpi", "A'rpi", "for hw decoders" diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index 4689777c2f..99fa7fc5ad 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -17,7 +17,6 @@ static vd_info_t info = { "PNG Images decoder", "mpng", - VFM_MPNG, "A'rpi", ".so, based on mpng.c", "uses libpng, 8bpp modes not supported yet" diff --git a/libmpcodecs/vd_msrle.c b/libmpcodecs/vd_msrle.c index c3c47ba183..9d97f5c354 100644 --- a/libmpcodecs/vd_msrle.c +++ b/libmpcodecs/vd_msrle.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Microsoft RLE decoder", "msrle", - VFM_MSRLE, "Mike Melanson", "Mike Melanson", "native codec" diff --git a/libmpcodecs/vd_msvidc.c b/libmpcodecs/vd_msvidc.c index 213deace77..a01e75eaa7 100644 --- a/libmpcodecs/vd_msvidc.c +++ b/libmpcodecs/vd_msvidc.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Microsoft Video 1 / CRAM decoder", "msvidc", - VFM_MSVIDC, "A'rpi", "Mike Melanson", "native codec" diff --git a/libmpcodecs/vd_nuv.c b/libmpcodecs/vd_nuv.c index 32bec90b8f..cb89ddb391 100644 --- a/libmpcodecs/vd_nuv.c +++ b/libmpcodecs/vd_nuv.c @@ -9,7 +9,6 @@ static vd_info_t info = { "NuppelVideo decoder", "nuv", - VFM_NUV, "A'rpi", "Alex & Panagiotis Issaris <takis@lumumba.luc.ac.be>", "native codecs" diff --git a/libmpcodecs/vd_odivx.c b/libmpcodecs/vd_odivx.c index 46f7526917..c7e703cd21 100644 --- a/libmpcodecs/vd_odivx.c +++ b/libmpcodecs/vd_odivx.c @@ -21,7 +21,6 @@ static vd_info_t info = { "Opendivx 0.48 codec", #endif "odivx", - VFM_ODIVX, "A'rpi", #ifdef NEW_DECORE "http://www.divx.com", diff --git a/libmpcodecs/vd_qtrle.c b/libmpcodecs/vd_qtrle.c index 70d6b494f1..de6356dd48 100644 --- a/libmpcodecs/vd_qtrle.c +++ b/libmpcodecs/vd_qtrle.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Quicktime Animation (RLE) decoder", "qtrle", - VFM_QTRLE, "A'rpi", "Mike Melanson", "native codec" diff --git a/libmpcodecs/vd_qtrpza.c b/libmpcodecs/vd_qtrpza.c index 3f38d8ff62..b36c0dc368 100644 --- a/libmpcodecs/vd_qtrpza.c +++ b/libmpcodecs/vd_qtrpza.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Quicktime Apple Video", "qtrpza", - VFM_QTRPZA, "Roberto Togni", "Roberto Togni", "native codec" diff --git a/libmpcodecs/vd_qtsmc.c b/libmpcodecs/vd_qtsmc.c index 8c5bf16da2..3c58c34971 100644 --- a/libmpcodecs/vd_qtsmc.c +++ b/libmpcodecs/vd_qtsmc.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Apple Graphics (SMC) decoder", "qtsmc", - VFM_QTSMC, "A'rpi", "Mike Melanson", "native codec" diff --git a/libmpcodecs/vd_raw.c b/libmpcodecs/vd_raw.c index c2733cd22b..ce7a553d89 100644 --- a/libmpcodecs/vd_raw.c +++ b/libmpcodecs/vd_raw.c @@ -9,7 +9,6 @@ static vd_info_t info = { "RAW Uncompressed Video", "raw", - VFM_RAW, "A'rpi", "A'rpi & Alex", "uncompressed" diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index cd5de310c9..c3c91da61e 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -14,7 +14,6 @@ static vd_info_t info = { "RealVideo decoder", "realvid", - VFM_REAL, "Florian Schneider & A'rpi", "using original closed source codecs for Linux", "binary real video codecs" diff --git a/libmpcodecs/vd_rle.c b/libmpcodecs/vd_rle.c index 00e3b76f29..4628459647 100644 --- a/libmpcodecs/vd_rle.c +++ b/libmpcodecs/vd_rle.c @@ -9,7 +9,6 @@ static vd_info_t info = { "RLE Video decoder", "msrle", - VFM_MSRLE, "A'rpi", "XAnim rip...", "native codec" diff --git a/libmpcodecs/vd_roqvideo.c b/libmpcodecs/vd_roqvideo.c index f63b83bac8..bc0a6d3bfd 100644 --- a/libmpcodecs/vd_roqvideo.c +++ b/libmpcodecs/vd_roqvideo.c @@ -9,7 +9,6 @@ static vd_info_t info = { "Id RoQ File Video decoder", "roqvideo", - VFM_ROQVIDEO, "A'rpi", "Mike Melanson", "native codec" diff --git a/libmpcodecs/vd_svq1.c b/libmpcodecs/vd_svq1.c index feaf2b2c4a..de598ed25b 100644 --- a/libmpcodecs/vd_svq1.c +++ b/libmpcodecs/vd_svq1.c @@ -9,7 +9,6 @@ static vd_info_t info = { "SVQ1 (Sorenson v1) Video decoder", "svq1", - VFM_SVQ1, "A'rpi", "XINE team", "native codec" diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index dc0a4d2abc..6e1a66d27d 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -14,7 +14,6 @@ static vd_info_t info = { "Win32/VfW video codecs", "vfw", - VFM_VFW, "A'rpi", "based on http://avifile.sf.net", "win32 codecs" diff --git a/libmpcodecs/vd_vfwex.c b/libmpcodecs/vd_vfwex.c index d0d70f8b76..fe20e7c3b2 100644 --- a/libmpcodecs/vd_vfwex.c +++ b/libmpcodecs/vd_vfwex.c @@ -14,7 +14,6 @@ static vd_info_t info = { "Win32/VfWex video codecs", "vfwex", - VFM_VFWEX, "A'rpi", "based on http://avifile.sf.net", "win32 codecs" diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index df603f8dad..6ee9c5f418 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -11,7 +11,6 @@ static vd_info_t info = { "XAnim codecs", "xanim", - VFM_XANIM, "A'rpi & Alex", "Xanim (http://xanim.va.pubnix.com/)", "binary codec plugins" diff --git a/libmpcodecs/vd_xvid.c b/libmpcodecs/vd_xvid.c index 13128aabe7..35072c76b6 100644 --- a/libmpcodecs/vd_xvid.c +++ b/libmpcodecs/vd_xvid.c @@ -16,7 +16,6 @@ static vd_info_t info = { "xvid decoder", "xvid", - VFM_XVID, "Albeu", "Albeu", "" diff --git a/libmpcodecs/vd_zlib.c b/libmpcodecs/vd_zlib.c index bd1d66c105..644b55515b 100644 --- a/libmpcodecs/vd_zlib.c +++ b/libmpcodecs/vd_zlib.c @@ -13,7 +13,6 @@ static vd_info_t info = { "zlib decoder (avizlib)", "zlib", - VFM_ZLIB, "Alex", "based on vd_ijpg.c", "uses zlib, supports only BGR24 (as AVIzlib)" |