[FFmpeg-cvslog] Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
Michael Niedermayer
git at videolan.org
Wed Apr 10 18:16:36 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 18:11:15 2013 +0200| [0726d516dcd1e12d493b402bbe256d8c4b50acc6] | committer: Michael Niedermayer
Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
* commit '335c31293baec6e6cf5907bd29840af3de8ff735':
vf_drawbox: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_drawbox.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0726d516dcd1e12d493b402bbe256d8c4b50acc6
---
More information about the ffmpeg-cvslog
mailing list