Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 13:56:18 +0000 (15:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Apr 2013 13:56:18 +0000 (15:56 +0200)
commit580a0600efbb374ec2228ff4c0ac44528259cde3
tree60a4c6d8ee228b71c578518a7c53dfda1fbc3a99
parentad9e66a56556a3135363121e8e115e4a592a16e2
parentac9362c5d985ca37d4debb4e0e12497d248ec9d1
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c