ffmpeg/libavformat
Michael Niedermayer 104f42e694 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc/APIchanges: add an entry for codec descriptors.
  vorbisenc: set AVCodecContext.bit_rate to 0
  vorbisenc: fix quality parameter
  FATE: add ALAC encoding tests
  lpc: fix alignment of windowed samples for odd maximum LPC order
  alacenc: use s16p sample format as input
  alacenc: remove unneeded sample_fmt check
  alacenc: fix max_frame_size calculation for the final frame
  adpcm_swf: Use correct sample offsets when using trellis.
  rtmp: support strict rtmp servers
  mjpegdec: support AVRn interlaced
  x86: remove FASTDIV inline asm

Conflicts:
	doc/APIchanges
	libavcodec/mjpegdec.c
	libavcodec/vorbisenc.c
	libavutil/x86/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-23 14:33:33 +02:00
..
2012-08-14 16:54:25 +02:00
2011-11-05 16:51:25 +01:00
2012-08-14 03:21:08 +02:00
2012-08-18 17:45:58 +02:00
2011-12-19 11:57:34 +01:00
2012-03-03 04:30:49 +01:00
2012-08-07 23:57:21 +02:00
2012-08-16 04:25:07 +02:00
2012-08-18 05:02:58 +02:00
2012-08-21 01:52:55 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-08-14 16:54:25 +02:00
2012-08-10 16:26:39 +02:00
2012-08-21 06:13:54 +02:00
2012-08-16 10:20:25 +02:00
2012-08-14 16:54:25 +02:00
2012-08-20 23:54:56 +02:00
2012-07-20 11:16:52 +02:00
2012-08-20 02:46:09 +02:00
2012-08-07 23:57:21 +02:00
2012-07-25 20:31:16 +03:00
2012-08-21 13:48:08 +02:00
2012-08-07 23:57:21 +02:00