ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Aug 26
21:45:39 2014 +0200| [9c41b59423bbb86685c05bcf3ef9d4a7efb54f34] | committer:
Michael Niedermayer
Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
libxvid: K&R formatting cosmetics
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9c41b59423bbb86685c05bcf3ef9d4a7efb54f34
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
