ffmpeg/libavcodec
Michael Niedermayer 6968a7d193 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc/general: update supported devices table.
  doc/general: add missing @tab to codecs table.
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  avconv: reindent
  avconv: link '-passlogfile' option to libx264 'stats' AVOption.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  http: Clear the auth state on redirects
  http: Retry auth if it failed due to being stale
  rtsp: Resend new keepalive commands if they used stale auth
  rtsp: Retry authentication if failed due to being stale
  httpauth: Parse the stale field in digest auth
  dxva2_vc1: pass the overlap flag to the decoder
  dxva2_vc1: fix decoding of BI frames
  FATE: add shorthand to wavpack test
  dfa: convert to bytestream2 API
  anm decoder: move buffer allocation from decode_init() to decode_frame()
  h264: improve parsing of broken AVC SPS

Conflicts:
	ffmpeg.c
	libavcodec/anm.c
	libavcodec/dfa.c
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_ps.c

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