[FFmpeg-cvslog] Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 23 19:26:59 2013 +0200| [4c18c31438d0f3357fc705b6d03d74728045a17f] | committer: Michael Niedermayer

Merge commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7'

* commit '1ce3ec24b35d9d549b12f17bd7fd391abaf3a6f7':
  h263: K&R formatting cosmetics

Conflicts:
	libavcodec/h263dec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c18c31438d0f3357fc705b6d03d74728045a17f
---