-
Michael Niedermayer authored
* commit '76efedea': qdm2: formatting cosmetics Conflicts: libavcodec/qdm2.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
e1f98f22
* commit '76efedea': qdm2: formatting cosmetics Conflicts: libavcodec/qdm2.c Merged-by:Michael Niedermayer <michaelni@gmx.at>