ffmpeg/libavcodec
Michael Niedermayer 580a0600ef 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>
2013-04-11 15:56:18 +02:00
..
2013-04-08 12:38:33 +03:00
2013-04-07 21:39:51 +02:00
2013-03-31 20:37:49 +02:00
2013-03-30 03:23:02 +00:00
2013-03-30 03:23:02 +00:00
2013-03-29 17:55:48 +01:00
2013-03-28 21:59:23 +01:00
2013-03-28 21:59:23 +01:00
2013-03-30 03:23:02 +00:00
2013-04-04 22:43:26 +00:00
2013-04-04 22:43:25 +00:00
2013-03-30 03:23:02 +00:00
2013-03-30 03:23:02 +00:00