[FFmpeg-cvslog] Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'
Michael Niedermayer
git at videolan.org
Tue Mar 4 22:09:00 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 4 22:01:24 2014 +0100| [adaba6a108aa9641633c529dc7da3f97f6619bc4] | committer: Michael Niedermayer
Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'
* commit '4c41a7a1798dd6c60e40f79be12faa98a9347151':
vf_frei0r: fix missing end of line character
Conflicts:
libavfilter/vf_frei0r.c
No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adaba6a108aa9641633c529dc7da3f97f6619bc4
---
More information about the ffmpeg-cvslog
mailing list