1af235f6b3
* qatar/release/10: ituh263: reject b-frame with pp_time = 0 af_compand: replace strtok_r() with av_get_token() latm: Always reconfigure if no extradata was set previously af_compand: add a dependency on strtok_r lavfi: add compand audio filter Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/af_compand.c libavfilter/allfilters.c libavfilter/version.h All changes are already in our 2.2 branch, this is just for metadata Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.