diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:17:50 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 15:17:50 +0200 |
commit | ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab (patch) | |
tree | df3c0f31373ac65f38df0061fc8ec180abde1993 /etc | |
parent | 8dd016c538340e4a50628eedae0561d45c95ef6b (diff) | |
parent | 5f5462c0ec32348a0b370b1f9c11bd7d10b52de6 (diff) | |
download | mpv-ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab.tar.bz2 mpv-ff2df2ac545bb36ca4c1d2f872236cdf0a7218ab.tar.xz |
Merge svn changes up to r30322
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 0f821628d5..407696451b 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3162,6 +3162,7 @@ videocodec rawuyvy fourcc UYNY UYVY fourcc uyv1 UYVY fourcc 2Vu1 UYVY + fourcc VDTZ UYVY out UYVY videocodec raw444P @@ -3286,6 +3287,8 @@ videocodec ffrawuyvy fourcc uyv1,UYV1 fourcc 2Vu1,2vu1,2VU1 fourcc 2Vuy,2vuy,2VUY + fourcc AV1x,AVup + fourcc VDTZ driver ffmpeg dll rawvideo out UYVY @@ -3490,7 +3493,7 @@ audiocodec ffatrc audiocodec ffsipr info "FFmpeg Sipr/Acelp.net audio" - status buggy ; missing 16k support + status working format 0x72706973 ; "sipr" format 0x130 ; acelp.net driver ffmpeg |