[FFmpeg-cvslog] Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
Michael Niedermayer
git at videolan.org
Thu Apr 11 01:47:03 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 01:39:15 2013 +0200| [ac217bda30a79177c8a47713b3db12dc9e9bd45b] | committer: Michael Niedermayer
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
af_asyncts: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac217bda30a79177c8a47713b3db12dc9e9bd45b
---
More information about the ffmpeg-cvslog
mailing list