ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Sep 3
04:13:37 2014 +0200| [feac9cbed0602503e9100dd2257ddc0d46e1929d] | committer:
Michael Niedermayer
Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'
* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
wmv2: K&R formatting cosmetics
Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feac9cbed0602503e9100dd2257ddc0d46e1929d
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
