Files
FFmpeg/libavformat
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-03-17 04:38:28 +01:00
2013-01-22 20:27:05 +01:00
2013-04-10 12:09:20 +02:00
2013-04-07 03:59:44 +02:00
2013-04-08 14:15:10 +02:00
2013-04-10 02:25:34 +02:00
2013-02-22 13:52:43 +00:00
2013-03-20 20:59:24 +01:00
2013-01-24 15:02:44 +00:00
2013-01-24 15:02:44 +00:00
2013-01-17 04:55:14 +01:00
2013-04-10 12:09:20 +02:00
2013-04-10 12:09:20 +02:00
2013-02-21 22:24:26 +01:00
2013-02-21 00:59:32 +01:00
2013-03-08 07:32:11 +01:00
2013-04-04 04:04:24 +02:00
2013-01-15 20:19:28 +01:00
2013-03-31 16:10:52 +02:00
2013-03-16 13:42:53 +01:00
2013-03-18 00:08:59 +01:00
2013-03-18 23:57:44 +01:00
2013-04-03 13:01:38 +00:00
2013-04-05 14:30:56 +00:00
2013-04-10 12:09:20 +02:00
2013-04-08 20:13:40 +02:00
2013-02-13 17:36:55 +00:00
2013-01-20 20:59:30 +01:00