ffmpeg 3.1 is in testing.

[nageru] / README

diff --git a/README b/README
index 30144fca86306c9930dbd6b7e124b74e7c573c8a..64f43f83ce27dfe4d04e6da5bb2bb5ae9d827e15 100644 (file)
--- a/README
+++ b/README
@@ -71,15 +71,12 @@ with:
     libavcodec-dev libavformat-dev libswscale-dev libavresample-dev \
     libmovit-dev libegl1-mesa-dev libasound2-dev libx264-dev
 
-Exceptions as of June 2016:
+Exceptions as of July 2016:
 
   - You need libusb 1.0.21 or newer (not yet released; you will need to
     use git) if you want zerocopy USB. Zerocopy USB helps not only for
     performance, but also for stability.
 
-  - Nageru depends on an avformat API for marking block boundaries in the
-    muxed byte stream that didn't enter ffmpeg before version 3.1.
-
 
 The patches/ directory contains a patch that helps zita-resampler performance.
 It is meant for upstream, but was not in at the time Nageru was released.
@@ -104,7 +101,7 @@ be saved live to local disk.
 If you have a fast CPU (typically a quadcore desktop; most laptops will spend
 most of their CPU on running Nageru itself), you can use x264 for the outgoing
 stream instead of Quick Sync; it is much better quality for the same bitrate,
-and also has proper bitrate controls. Simple add --http-x264-video on the
+and also has proper bitrate controls. Simply add --http-x264-video on the
 command line. (You may also need to add something like "--x264-preset veryfast",
 since the default "medium" preset might be too CPU-intensive, but YMMV.)
 The stream saved to disk will still be the Quick Sync-encoded stream, as it is