diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 18 | ||||
| -rw-r--r-- | etc/example.conf | 16 |
2 files changed, 33 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 4faaa307d0..5242f05f69 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3,7 +3,7 @@ ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ;============================================================================= -release 20100605 +release 20101127 ;============================================================================= ; VIDEO CODECS @@ -2714,6 +2714,15 @@ videocodec ffcavs dll "cavs" out YV12,I420 +videocodec qtdnxhd + info "QuickTime Avid DNxHD" + comment "needed for decoding 10-bit DNxHD" + status working + fourcc AVdn + driver qtvideo + dll "AvidAVdnCodec.qtx" + out UYVY,BGR24 + videocodec ffdnxhd info "FFmpeg DNxHD" status working @@ -4705,6 +4714,13 @@ audiocodec g72x driver g72x dll "g72x.c" +audiocodec ffg722 + info "G.722 Audio" + status working + format 0x28F + driver ffmpeg + dll "g722" + audiocodec ffg726 info "Sharp G.726 Audio" status working diff --git a/etc/example.conf b/etc/example.conf index bdd3cb56bf..800e82be4e 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -10,6 +10,9 @@ # # See the CONFIGURATION FILES section in the man page # for a detailed description of the syntax. +# +# Profiles should be at the bottom of the config file to ensure you dont +# put default options under profiles accidentally. ################## @@ -19,6 +22,11 @@ # Specify vdpau codecs when using -vo vdpau. #[vo.vdpau] #vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, +# Most video filters do not work with vdpau. +#vf-clr=yes + +# Make sure options under vo.vdpau profile are counted when vdpau is not used +#[default] # Specify default video driver (see -vo help for a list). #vo=xv @@ -102,6 +110,14 @@ # Fixes playback for apple.com/trailers redirects #user-agent="QuickTime" +# Pretend to be Realplayer SP +# Fixes playback for some video streaming sites +#user-agent=RMA/1.0 + +# Pretend to be Winamp +# Fixes playback of some NSV streams +#user-agent="Winamp NSV Player/5.12 (ultravox/2.0)" + # Drop frames to preserve audio/video sync. #framedrop = yes |