Merge commit '0a024268261d05ccdcf7e03c85fb78d22037a464'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 19:45:39 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 19:45:39 +0000 (21:45 +0200)
commit9c41b59423bbb86685c05bcf3ef9d4a7efb54f34
tree1af9635e45836c894309762f84c93ed4d29615de
parentffa90d99fd8933b17917045a3768bb9dcfb56f72
parent0a024268261d05ccdcf7e03c85fb78d22037a464
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>
libavcodec/libxvid.c
libavcodec/libxvid.h
libavcodec/libxvid_rc.c
libavutil/file.c