Files
ffmpeg/libavcodec
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-12-13 23:07:40 +01:00
2011-11-27 21:19:07 +01:00
2011-12-15 03:59:29 +01:00
2011-12-14 00:39:58 +01:00
2011-11-25 13:19:54 +00:00
2011-12-18 20:51:40 +01:00
2011-12-18 20:49:34 +01:00
2011-12-20 18:07:08 +01:00
2011-11-06 09:37:34 +01:00
2011-11-12 19:36:23 +01:00
2011-09-16 05:53:14 +02:00
2011-11-12 19:37:24 +01:00
2011-11-12 20:01:05 +01:00
2011-11-12 20:01:50 +01:00
2011-12-28 22:05:24 +01:00
2011-11-12 20:05:35 +01:00
2011-10-30 21:50:17 +01:00
2011-10-30 21:50:17 +01:00
2011-11-14 18:14:20 +01:00
2011-11-05 00:02:31 +01:00
2011-12-11 00:32:25 +01:00
2011-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-12-10 11:58:03 +01:00
2011-12-19 16:30:30 +01:00
2011-11-09 23:10:07 +01:00
2011-12-11 00:32:25 +01:00
2011-10-10 02:58:18 +02:00
2011-09-24 21:11:01 +02:00
2011-12-03 03:00:44 +01:00
2011-09-25 21:16:55 +02:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-12-23 05:58:32 +01:00
2011-08-30 05:41:44 +02:00
2011-10-21 01:00:41 -07:00
2011-10-21 01:00:41 -07:00
2011-12-21 00:35:10 +01:00
2011-12-29 17:42:31 +01:00
2011-12-28 15:22:18 +01:00
2011-12-24 18:51:36 +01:00
2011-11-12 21:00:12 +01:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-11-13 15:43:09 +01:00
2011-11-24 15:39:41 +01:00
2011-12-17 05:04:56 +01:00
2011-12-13 15:46:23 +01:00
2011-11-11 18:40:19 +01:00
2011-12-28 05:59:39 +01:00
2011-12-13 21:08:43 +01:00
2011-11-12 20:15:21 +01:00
2011-12-13 20:01:49 +01:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-09-17 21:55:11 +02:00
2011-12-13 21:08:43 +01:00
2011-12-23 11:39:41 +01:00
2011-12-02 03:23:07 +01:00
2011-12-13 19:54:31 +01:00
2011-10-19 20:26:55 +02:00
2011-12-01 18:46:22 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-12 20:49:53 +01:00