diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:54:52 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:55:05 +0300 |
commit | e913d6c5dabcf342d8c1a7070382d712fc354948 (patch) | |
tree | 965b5b698c7075e53123593eb4b5bfdb45d78c56 /etc/codecs.conf | |
parent | be935e27666d8fdbf387adb1fcc30d243f6359dc (diff) | |
parent | 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff) | |
download | mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2 mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz |
Merge svn changes up to r31004
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r-- | etc/codecs.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 808f1e3335..a8fc871bd7 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3044,7 +3044,7 @@ videocodec ffc93 dll c93 out BGR8 -videocodec eatgv +videocodec ffeatgv info "FFmpeg Electronic Arts TGV" status working fourcc fVGT @@ -4242,7 +4242,7 @@ audiocodec dvdpcm format 0x10001 driver dvdpcm -audiocodec lpcm +audiocodec fflpcm info "Bluray LPCM" status working fourcc BPCM ; internal MPlayer FourCC |