ffmpeg/libavformat
Michael Niedermayer 00c0465dbc Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: split off DPCM codec FATE tests into their own file
  fate: split off PCM codec FATE tests into their own file
  libvorbis: K&R reformatting cosmetics
  libmp3lame: K&R formatting cosmetics
  fate: Add a video test for xxan decoder
  mpegvideo_enc: K&R cosmetics (line 1000-2000).
  avconv: K&R cosmetics
  qt-faststart: Fix up indentation
  indeo4: remove two unused variables
  doxygen: cleanup style to support older doxy
  fate: add more tests for VC-1 decoder
  applehttpproto: Apply the same reload interval changes as for the demuxer
  applehttp: Use half the target duration as interval if the playlist didn't update
  applehttp: Use the last segment duration as reload interval
  lagarith: add decode support for arith rgb24 mode

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-30 03:46:24 +01:00
..
2011-11-30 20:34:45 +01:00
2011-12-28 20:17:20 +01:00
2011-12-12 20:21:47 +01:00
2011-11-05 16:51:25 +01:00
2011-12-24 23:21:40 +01:00
2011-12-24 03:41:50 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-12-23 23:59:10 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-08-01 00:58:49 +02:00
2011-08-22 09:35:58 +02:00
2011-08-09 19:56:25 +02:00
2011-11-30 20:34:45 +01:00
2011-12-04 16:44:20 +01:00
2011-11-03 20:21:01 +01:00
2011-12-14 03:38:57 +01:00
2011-12-29 15:25:07 +01:00
2011-12-28 20:17:20 +01:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2011-12-30 01:44:47 +01:00
2011-12-20 22:38:53 +01:00
2011-12-18 16:23:16 +01:00
2011-12-10 22:02:44 +01:00
2011-10-13 16:50:20 +02:00
2011-12-17 03:25:46 +01:00
2011-12-18 23:54:56 +01:00
2011-12-24 21:26:52 +01:00
2011-11-30 17:39:32 +02:00
2011-12-19 19:11:49 +01:00
2011-12-16 06:02:14 +01:00