From b49b4e6ef9808d0ad6501c286708d28d894d24ac Mon Sep 17 00:00:00 2001 From: compn Date: Tue, 22 Mar 2011 11:44:26 +0000 Subject: codecs.conf: add xd55 isom for mpeg2 video from fcp git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33094 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: etc/codecs.conf --- etc/codecs.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/codecs.conf b/etc/codecs.conf index 433798b1bd..5f54bec48f 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,xd54 + fourcc xd59,xd54,xd55 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,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -280,7 +280,7 @@ videocodec ffmpeg12mc fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -315,7 +315,7 @@ videocodec ffmpeg12vdpau fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp @@ -345,7 +345,7 @@ videocodec mpegpes fourcc xdvd,xdve,xdvf fourcc xd5a,xd5b,xd5c fourcc xd5d,xd5e,xd5f - fourcc xd59,xd54 + fourcc xd59,xd54,xd55 fourcc mx5n,mx4n,mx4p fourcc mx3n,mx3p fourcc AVmp -- cgit v1.2.3