Michael Niedermayer 9c41b59423 Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464' ...

* commit '0a024268261d05ccdcf7e03c85fb78d22037a464':
  libxvid: K&R formatting cosmetics

Conflicts:
	libavcodec/libxvid.c
	libavcodec/libxvid_rc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-08-26 21:45:39 +02:00

5.3 KiB

Raw Blame History

View Raw