ffmpeg/libavformat
Michael Niedermayer 612122b187 Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
  10-bit H.264 x86 chroma v loopfilter asm
  Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected]
  Fix crash of interlaced MPEG2 decoding
  h264pred: fix one more aliasing violation.
  doc/APIchanges: fill in missing hashes and dates.
  flacenc: use proper initializers for AVOption default values.
  lavc: deprecate named constants for deprecated antialias_algo.
  aac: workaround for compilation on cygwin
  swscale: extend YUV422p support to 10bits depth
  tiff: add support for inverted FillOrder for uncompressed data
  Remove unused softfloat implementation.
  h264pred: fix aliasing violations.
  rotozoom: Eliminate French variable name.
  rotozoom: Check return value of fread().
  rotozoom: Return an error value instead of calling exit().
  rotozoom: Make init_demo() return int and check for errors on invocation.
  rotozoom: Drop silly UINT8 typedef.
  rotozoom: Drop some unnecessary parentheses.
  rotozoom: K&R coding style cosmetics
  rtsp: Only do keepalive using GET_PARAMETER if the server supports it
  ...

Conflicts:
	Changelog
	cmdutils.c
	doc/APIchanges
	doc/general.texi
	ffmpeg.c
	ffplay.c
	libavcodec/h264pred_template.c
	libavcodec/resample.c
	libavutil/pixfmt.h
	libavutil/softfloat.c
	libavutil/softfloat.h
	tests/rotozoom.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-12 04:51:24 +02:00
..
2011-05-06 17:39:31 +02:00
2011-04-04 02:15:12 +02:00
2011-04-25 02:29:09 +02:00
2011-04-17 23:43:54 +02:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +02:00
2011-04-07 03:32:26 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-30 22:09:15 +02:00
2011-05-07 20:14:47 +02:00
2011-04-29 04:29:21 +02:00
2011-04-04 02:15:12 +02:00
2011-04-09 03:17:07 +02:00
2011-04-10 03:32:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-30 01:58:26 +02:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +02:00
2011-04-18 18:23:16 +02:00
2011-04-21 03:37:05 +02:00
2011-05-09 16:05:29 +02:00
2011-04-09 03:17:07 +02:00
2011-04-04 02:15:12 +02:00
2011-04-17 23:43:54 +02:00
2011-05-02 18:38:16 +02:00
2011-04-17 23:43:54 +02:00
2011-04-28 10:47:00 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-07 03:32:26 +02:00
2011-04-03 16:40:12 +02:00
2011-05-05 03:30:24 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 02:15:12 +02:00
2011-04-20 04:48:23 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-05-07 04:14:09 +02:00
2011-05-05 03:30:24 +02:00
2011-04-04 02:15:12 +02:00
2011-05-12 04:51:24 +02:00
2011-04-29 04:29:21 +02:00
2011-04-20 04:48:23 +02:00
2011-05-07 09:47:35 +02:00
2011-04-23 01:09:43 +02:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-05-11 22:43:30 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-05 02:31:56 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-24 03:41:22 +02:00
2011-04-05 02:31:56 +02:00
2011-04-24 03:41:22 +02:00
2011-05-10 04:03:17 +02:00
2011-05-12 04:51:24 +02:00
2011-05-12 04:51:24 +02:00
2011-05-12 04:51:24 +02:00
2011-04-09 03:17:07 +02:00
2011-04-20 04:48:23 +02:00
2011-04-20 04:48:23 +02:00
2011-04-09 03:17:07 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-21 03:37:05 +02:00
2011-04-04 02:15:12 +02:00
2011-05-10 04:03:17 +02:00
2011-04-14 03:21:38 +02:00
2011-04-24 03:41:22 +02:00
2011-04-04 02:15:12 +02:00
2011-05-01 21:13:18 +02:00
2011-05-01 21:13:18 +02:00
2011-04-04 02:15:12 +02:00