summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-28 00:37:32 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-28 00:37:32 +0200
commit6ece23f1b12e80960c66a8596a3c927bf7ee8621 (patch)
tree0163085cfa02840fe8b0e994657583120e8f574a /etc
parent167322fa33b6efbc1f1d681327b4a928ba0b706a (diff)
parentb1f3c590c79534efb970220d4c186063adb225aa (diff)
downloadmpv-6ece23f1b12e80960c66a8596a3c927bf7ee8621.tar.bz2
mpv-6ece23f1b12e80960c66a8596a3c927bf7ee8621.tar.xz
Merge svn changes up to r30437
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 04662dd90d..3496604e49 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -130,7 +130,6 @@ videocodec mpegpes
fourcc m2v1,m1v1
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc PIM2 ; Pinnacle hardware-MPEG-2
- fourcc VCR2
fourcc LMP2 ; Lead mpeg2 in avi
driver mpegpes
out MPES
@@ -234,7 +233,6 @@ videocodec mpeg12
fourcc mpg1
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc PIM2 ; Pinnacle hardware-MPEG-2
- fourcc VCR2
fourcc mpg2,MPG2
fourcc MPEG
fourcc hdv1
@@ -307,7 +305,6 @@ videocodec ffmpeg12vdpau
fourcc mpg1,mpg2,MPG2
fourcc PIM1 ; Pinnacle hardware-MPEG-1
fourcc PIM2 ; Pinnacle hardware-MPEG-2
- fourcc VCR2
fourcc "DVR "
fourcc hdv2
fourcc MPEG