ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri
Jul 17 22:56:00 2015 +0200| [65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c] |
committer: Michael Niedermayer
Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'
* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
configure: Factor out wmv2dsp module
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=65b0f7ce08170dd2ca2998d42e0bd9f1cb82e76c
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
