[FFmpeg-cvslog] Merge commit '6230de03aad9f26d5843afb913d196622e0b5b98' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 13:12:02 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 12:14:41 2014 +0100| [4a1e7a6fb7b82f8e39666de9e90f7de6190ea7b1] | committer: Michael Niedermayer

Merge commit '6230de03aad9f26d5843afb913d196622e0b5b98' into release/2.2

* commit '6230de03aad9f26d5843afb913d196622e0b5b98':
  vf_frei0r: refactor library loading from env variable

Conflicts:
	configure
	libavfilter/vf_frei0r.c

Not merged, we use av_strtok() which leads to simpler code

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list