diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
| commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
| tree | b09b4c45898be2754f156ebba16fa1054f42788d /etc | |
| parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
| parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
| download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz | |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index aa539fbdcf..0541315108 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -9,6 +9,15 @@ release 20070930 ; VIDEO CODECS ;============================================================================= +videocodec ffmvi1 + info "FFmpeg Motion Pixels Decoder" + status working + fourcc MVI1 ; internal MPlayer FourCC + driver ffmpeg + dll motionpixels + out BGR32,BGR24,BGR8,Y800,RGB32,RGB24,RGB8 + out YV12,YUY2 + videocodec ffmdec info "FFmpeg Sony PlayStation MDEC (Motion DECoder)" status working @@ -68,6 +77,12 @@ videocodec mpegpes format 0x10000002 ; mpeg 2 fourcc mpg1,MPG1,mpg2,MPG2 fourcc MPEG + fourcc hdv6,hdv7,hdv8 + fourcc xdv1,xdv2,xdv3 + fourcc xdv4,xdv5,xdv6 + fourcc xdv7,xdv8,xdv9 + fourcc xdva,xdvb,xdvc + fourcc xdvd,xdve,xdvf driver mpegpes out MPES @@ -95,6 +110,12 @@ videocodec ffmpeg2 fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi + fourcc hdv6,hdv7,hdv8 + fourcc xdv1,xdv2,xdv3 + fourcc xdv4,xdv5,xdv6 + fourcc xdv7,xdv8,xdv9 + fourcc xdva,xdvb,xdvc + fourcc xdvd,xdve,xdvf driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -116,6 +137,12 @@ videocodec ffmpeg12 fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi + fourcc hdv6,hdv7,hdv8 + fourcc xdv1,xdv2,xdv3 + fourcc xdv4,xdv5,xdv6 + fourcc xdv7,xdv8,xdv9 + fourcc xdva,xdvb,xdvc + fourcc xdvd,xdve,xdvf driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -138,6 +165,12 @@ videocodec mpeg12 fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi + fourcc hdv6,hdv7,hdv8 + fourcc xdv1,xdv2,xdv3 + fourcc xdv4,xdv5,xdv6 + fourcc xdv7,xdv8,xdv9 + fourcc xdva,xdvb,xdvc + fourcc xdvd,xdve,xdvf driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -158,6 +191,12 @@ videocodec ffmpeg12mc fourcc hdv5 ; HDV 720p25 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) fourcc MMES,mmes ; matrox mpeg2 in avi + fourcc hdv6,hdv7,hdv8 + fourcc xdv1,xdv2,xdv3 + fourcc xdv4,xdv5,xdv6 + fourcc xdv7,xdv8,xdv9 + fourcc xdva,xdvb,xdvc + fourcc xdvd,xdve,xdvf driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2 @@ -1588,6 +1627,14 @@ videocodec ffvp6 dll "vp6" out YV12 +videocodec ffvp6a + info "FFmpeg VP6A decoder" + status untested + fourcc VP6A + driver ffmpeg + dll "vp6a" + out I420,YUY2,YV12 + videocodec ffvp6f info "FFmpeg VP6 Flash decoder" status working |