[FFmpeg-cvslog] Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
Michael Niedermayer
git at videolan.org
Mon Dec 9 12:08:58 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 9 11:44:37 2013 +0100| [9eac7c435f9c9dfc7ed4bbc8ec5a4bc710b486f2] | committer: Michael Niedermayer
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
avformat: AviSynth demuxer rewrite
Conflicts:
configure
libavformat/avisynth.c
See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9eac7c435f9c9dfc7ed4bbc8ec5a4bc710b486f2
---
More information about the ffmpeg-cvslog
mailing list