diff options
Diffstat (limited to 'etc')
-rw-r--r-- | etc/codecs.conf | 13 | ||||
-rw-r--r-- | etc/example.conf | 9 |
2 files changed, 21 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 49faf25322..9c7751b909 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -76,6 +76,14 @@ videocodec yuv8 out YV12,I420,UYVY out BGR24,BGR15,BGR32 +videocodec ffr210 + info "FFmpeg R210 - 10-bit RGB" + status working + fourcc r210 + driver ffmpeg + dll "r210" + out RGB48BE,RGB48LE + videocodec blackmagic info "Blackmagic 10-bit" status working @@ -162,6 +170,7 @@ videocodec ffmpeg2 fourcc m2v1 fourcc PIM2 fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -200,6 +209,7 @@ videocodec ffmpeg12 fourcc mp2v,mpgv fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi + fourcc slif ; SoftLab MPEG-2 I-frames Codec driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -1265,6 +1275,8 @@ videocodec ffmjpeg fourcc SLMJ ; SL M-JPEG fourcc MVJP ; Midvid JPEG Video Codec fourcc IJLV ; Intel JPEG Library Video Codec + fourcc avi1,avi2 + fourcc MTSJ driver ffmpeg dll mjpeg out 444P @@ -1340,6 +1352,7 @@ videocodec LEAD fourcc MJPG fourcc jpeg MJPG ; MOV Photo-JPEG fourcc LEAD + fourcc MTSJ MJPG driver vfw dll "LCodcCMP.dll" out BGR24,BGR15 diff --git a/etc/example.conf b/etc/example.conf index a0fec86eb0..bdd3cb56bf 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -16,6 +16,10 @@ # video settings # ################## +# Specify vdpau codecs when using -vo vdpau. +#[vo.vdpau] +#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, + # Specify default video driver (see -vo help for a list). #vo=xv @@ -82,6 +86,9 @@ # Resample the sound to 44100Hz with the lavcresample audio filter. #af=lavcresample=44100 +# Output audio to S/PDIF +#ao=alsa:device=spdif +#ac=hwac3,hwdts,hwmpa, ################## # other settings # @@ -93,7 +100,7 @@ # Pretend to be Quicktime # Fixes playback for apple.com/trailers redirects -#user-agent="QuickTime/7.1.3 (qtver=7.1.3;cpu=PPC;os=Mac 10.4.8)" +#user-agent="QuickTime" # Drop frames to preserve audio/video sync. #framedrop = yes |