summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcompn <compn@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-10-05 01:01:14 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:18:08 +0200
commitd6a143acc146093b37dfe21ba7e9d3e737314311 (patch)
treeb0cf9c3ca7ff2d45290077f7ae4b44c983b1f378 /etc
parentc310aa46283fb62ea7e6c0533a247eb3afe672c4 (diff)
downloadmpv-d6a143acc146093b37dfe21ba7e9d3e737314311.tar.bz2
mpv-d6a143acc146093b37dfe21ba7e9d3e737314311.tar.xz
codecs.conf: add another xdcam mpeg2 fourcc/isom xd54
Also mark ffwmvp as requiring lavf demuxer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32440 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf13
1 files changed, 7 insertions, 6 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a881dfc22a..a8c542f8e0 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -200,7 +200,7 @@ videocodec ffmpeg2
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59
+ fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -242,7 +242,7 @@ videocodec ffmpeg12
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59
+ fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -282,7 +282,7 @@ videocodec mpeg12
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59
+ fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -319,7 +319,7 @@ videocodec ffmpeg12mc
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59
+ fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -354,7 +354,7 @@ videocodec ffmpeg12vdpau
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59
+ fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -384,7 +384,7 @@ videocodec mpegpes
fourcc xdvd,xdve,xdvf
fourcc xd5a,xd5b,xd5c
fourcc xd5d,xd5e,xd5f
- fourcc xd59
+ fourcc xd59,xd54
fourcc mx5n,mx4n,mx4p
fourcc mx3n,mx3p
fourcc AVmp
@@ -945,6 +945,7 @@ videocodec ffwmv3
videocodec ffwmvp
info "FFmpeg WVC1"
+ comment "requires demuxer lavf"
status buggy
fourcc wmvp,WMVP
driver ffmpeg