diff options
author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /etc/codecs.conf | |
parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r-- | etc/codecs.conf | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index ab9267c5a9..9d4e8c9e0c 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -732,6 +732,22 @@ videocodec ffh264crystalhd driver ffmpeg dll h264_crystalhd +videocodec ffh264vda + info "FFmpeg H.264 (VDA)" + status working + fourcc H264,h264 + fourcc X264,x264 + fourcc avc1,AVC1 + fourcc davc,DAVC + fourcc vvvc ; only one sample using this fourcc + fourcc ai55,ai15 ; flip4mac avc intra + fourcc ai1q,ai5q ; flip4mac avc intra + fourcc ai12 ;AVC Intra 100 / 1080 + format 0x10000005 + driver ffmpeg + dll h264_vda + out YUY2,UYVY,YV12,NV12 + videocodec ffsvq3 info "FFmpeg Sorenson Video v3 (SVQ3)" status working |