Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:16:04 +0000 (22:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:16:04 +0000 (22:16 +0200)
commit521f5697348d96ac7c725bc2cba14d6ce4944334
tree6ab1a8b2b02141859532a4b5d9e35d5a3188e02d
parent42d326353c17085a98f0e81844f0c6320d70e8f3
parent8b0dd4942aac320d1ca3c40fa7ea1be342c71273
Merge commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273'

* commit '8b0dd4942aac320d1ca3c40fa7ea1be342c71273':
  idctdsp: prettyprinting cosmetics

Conflicts:
libavcodec/idctdsp.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/idctdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/idctdsp_init_arm.c
libavcodec/arm/idctdsp_init_armv5te.c
libavcodec/arm/idctdsp_init_armv6.c
libavcodec/arm/idctdsp_init_neon.c
libavcodec/idctdsp.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/idctdsp_init.c