Files
ffmpeg/libavcodec
Michael Niedermayer 8e576d5830 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libavutil: add utility functions to simplify allocation of audio buffers.
  libavutil: add planar sample formats and av_sample_fmt_is_planar()
  avconv: fix segfault at EOF with delayed pictures
  pcmdec: remove unneeded resetting of samples pointer
  avconv: remove a now unused parameter from output_packet().
  avconv: formatting fixes in output_packet()
  avconv: declare some variables in blocks where they are used
  avconv: use the same behavior when decoding audio/video/subs
  bethsoftvideo: return proper consumed size for palette packets.
  cdg: skip packets that don't contain a cdg command.
  crcenc: add flags
  avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
  tiffenc: add a private option for selecting compression algorithm
  md5enc: add flags
  ARM: remove needless .text/.align directives

Conflicts:
	doc/APIchanges
	libavcodec/tiffenc.c
	libavutil/avutil.h
	libavutil/samplefmt.c
	libavutil/samplefmt.h
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cdgraphics
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/nuv
	tests/ref/fate/tiertex-seq
	tests/ref/fate/tscc-32bit
	tests/ref/fate/vmnc-32bit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-24 03:32:24 +01:00
..
2011-11-20 14:51:38 +06:00
2011-11-06 09:37:34 +01:00
2011-11-12 20:47:33 +01:00
2011-11-12 19:36:23 +01: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-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-11-05 00:02:38 +01:00
2011-11-12 20:07:31 +01:00
2011-11-09 23:10:07 +01:00
2011-11-19 04:07:26 +01:00
2011-11-05 15:37:02 +01:00
2011-11-05 15:37:02 +01:00
2011-10-26 14:32:01 +02:00
2011-11-12 21:00:12 +01:00
2011-11-13 15:43:09 +01:00
2011-11-13 03:01:30 +01:00
2011-11-17 21:06:46 +01:00
2011-11-20 14:51:38 +06:00
2011-11-02 02:26:28 +01:00
2011-11-19 04:07:26 +01:00
2011-11-11 18:40:19 +01:00
2011-11-21 16:36:49 +01:00
2011-11-12 20:15:21 +01:00
2011-10-27 14:34:45 +02:00
2011-10-27 15:27:32 +02:00
2011-11-12 20:15:56 +01:00
2011-11-12 20:16:43 +01:00
2011-11-12 20:17:56 +01:00
2011-11-12 20:21:07 +01:00
2011-11-15 00:41:36 +01:00
2011-11-15 00:41:36 +01:00
2011-11-13 15:04:29 +01:00
2011-11-12 20:49:53 +01:00