diff options
147 files changed, 7534 insertions, 7124 deletions
diff --git a/.gitignore b/.gitignore index 6915d4ff65..79fa978ed4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ /core/input/input_conf.h /tags /TAGS -/video/out/vo_opengl_shaders.h +/video/out/gl_video_shaders.h /video/out/vdpau_template.c /demux/ebml_defs.c /demux/ebml_types.h diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst index 23a89d3163..979bc0b322 100644 --- a/DOCS/encoding.rst +++ b/DOCS/encoding.rst @@ -67,7 +67,7 @@ Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, Matroska (MKV) container:: mpv infile -o outfile.mkv \ -ovc libx264 -ovcopts preset=medium,crf=23,profile=baseline \ - -oac vorbis -oacopts qscale=3 + -oac libvorbis -oacopts qscale=3 Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, MPEG-4 (MP4) container:: diff --git a/DOCS/man/en/af.rst b/DOCS/man/en/af.rst index a47a63b8e2..2eaeabed0c 100644 --- a/DOCS/man/en/af.rst +++ b/DOCS/man/en/af.rst |