[FFmpeg-cvslog] Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
Michael Niedermayer
git at videolan.org
Thu Apr 11 02:42:41 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 02:33:31 2013 +0200| [42c70b358418cb0a364f9b12954b93d6d29be7fb] | committer: Michael Niedermayer
Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
af_join: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_join.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42c70b358418cb0a364f9b12954b93d6d29be7fb
---
More information about the ffmpeg-cvslog
mailing list