[FFmpeg-cvslog] Merge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  1 12:41:42 2017 +0200| [2b1a6b1ae31a24d58c5e5f4a0cd7e56eefb027c0] | committer: Clément Bœsch

Merge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f'

* commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f':
  doc: Add note about recent regression in AviSynth+

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b1a6b1ae31a24d58c5e5f4a0cd7e56eefb027c0
---

 doc/general.texi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/general.texi b/doc/general.texi
index 80eaace..b489762 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -187,6 +187,19 @@ For Linux and OS X, the supported AviSynth variant is
 @url{https://github.com/avxsynth/avxsynth, AvxSynth}.
 
 @float NOTE
+There is currently a regression in AviSynth+'s @code{capi.h} header as of
+October 2016, which interferes with the ability for builds of Libav to use
+MSVC-built binaries of AviSynth. Until this is resolved, you can make sure
+a known good version is installed by checking out a version from before
+the regression occurred:
+
+ at code{git clone -b MT git://github.com/AviSynth/AviSynthPlus.git @*
+cd AviSynthPlus @*
+git checkout -b oldheader b4f292b4dbfad149697fb65c6a037bb3810813f9 @*
+make install PREFIX=/install/prefix}
+ at end float
+
+ at float NOTE
 AviSynth and AvxSynth are loaded dynamically.  Distributors can build FFmpeg
 with @code{--enable-avisynth}, and the binaries will work regardless of the
 end user having AviSynth or AvxSynth installed - they'll only need to be


======================================================================

diff --cc doc/general.texi
index 80eaace,7b1f11c..b489762
--- a/doc/general.texi
+++ b/doc/general.texi
@@@ -182,12 -177,42 +182,25 @@@ without needing to search for these hea
  For Windows, supported AviSynth variants are
  @url{http://avisynth.nl, AviSynth 2.6 RC1 or higher} for 32-bit builds and
  @url{http://avs-plus.net, AviSynth+ r1718 or higher} for 32-bit and 64-bit builds.
 - at url{https://github.com/AviSynth/AviSynthPlus, AviSynth+'s git repository}
 -provides a GNU-style Makefile which can install just the headers using
 - at code{make install PREFIX=/install/prefix}.
 +
 +For Linux and OS X, the supported AviSynth variant is
 + at url{https://github.com/avxsynth/avxsynth, AvxSynth}.
  
  @float NOTE
+ There is currently a regression in AviSynth+'s @code{capi.h} header as of
+ October 2016, which interferes with the ability for builds of Libav to use
+ MSVC-built binaries of AviSynth. Until this is resolved, you can make sure
+ a known good version is installed by checking out a version from before
+ the regression occurred:
+ 
+ @code{git clone -b MT git://github.com/AviSynth/AviSynthPlus.git @*
+ cd AviSynthPlus @*
+ git checkout -b oldheader b4f292b4dbfad149697fb65c6a037bb3810813f9 @*
+ make install PREFIX=/install/prefix}
+ @end float
+ 
+ @float NOTE
 -When using AviSynth+'s installed headers, the user must also pass
 -the avisynth/ include directory to @code{--extra-cflags}. For example,
 -if the PREFIX given to AviSynth+'s Makefile was /usr/i686-w64-mingw32,
 -then the correct command would be
 - at code{--extra-cflags="-I/usr/i686-w64-mingw32/include/avisynth"}.
 - at end float
 -
 -For Linux and OS X, the supported AviSynth variant is
 - at url{https://github.com/avxsynth/avxsynth, AvxSynth}.
 - at file{avxsynth_c.h} is installed as part of the normal
 -build routine, as illustrated on
 - at url{https://github.com/avxsynth/avxsynth/wiki/System-Setup, AvxSynth's wiki}.
 -(the instructions for compiling its prerequisites are outdated, as FFMS 2.18
 -or higher is now needed; the list of dependencies to be downloaded from the
 -repositories is still the same, though).
 -
 - at float NOTE
 -AviSynth and AvxSynth are loaded dynamically.  Distributors can build Libav
 +AviSynth and AvxSynth are loaded dynamically.  Distributors can build FFmpeg
  with @code{--enable-avisynth}, and the binaries will work regardless of the
  end user having AviSynth or AvxSynth installed - they'll only need to be
  installed to use AviSynth scripts (obviously).