[FFmpeg-cvslog] Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  8 05:10:06 2013 +0200| [e1f98f22313bfde3c85ac566902adeb118ec6d18] | committer: Michael Niedermayer

Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'

* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
	libavcodec/qdm2.c

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

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