Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 03:10:06 +0000 (05:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 03:10:06 +0000 (05:10 +0200)
commite1f98f22313bfde3c85ac566902adeb118ec6d18
treedc266dcf0506656f9712aed1064c2dd4de7b39a9
parentd28a8ad8f33df0b65aa9daa0ed516c9d78dabdb9
parent76efedeadb1f6bf79020c44a71dd0cee13d932ad
Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'

* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
  qdm2: formatting cosmetics

Conflicts:
libavcodec/qdm2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qdm2.c