[FFmpeg-cvslog] Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
Michael Niedermayer
git at videolan.org
Tue Mar 4 13:38:04 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 4 13:26:48 2014 +0100| [d63b032d64e96f108c1524514898eafb4144e183] | committer: Michael Niedermayer
Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
* commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d':
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=d63b032d64e96f108c1524514898eafb4144e183
---
More information about the ffmpeg-cvslog
mailing list