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>

1 files changed, 52 insertions, 84 deletions

diff --git a/tests/ref/fate/deluxepaint-anm b/tests/ref/fate/deluxepaint-anm
index 2a60606611..98da9287a6 100644
--- a/tests/ref/fate/deluxepaint-anm
+++ b/tests/ref/fate/deluxepaint-anm
@@ -69,87 +69,55 @@
 0, 204000, 192000, 0xdd7f371d
 0, 207000, 192000, 0xeed134c6
 0, 210000, 192000, 0x362931f5
-0, 213000, 192000, 0x362931f5
-0, 216000, 192000, 0x362931f5
-0, 219000, 192000, 0x362931f5
-0, 222000, 192000, 0x362931f5
-0, 225000, 192000, 0x362931f5
-0, 228000, 192000, 0x362931f5
-0, 231000, 192000, 0x362931f5
-0, 234000, 192000, 0x362931f5
-0, 237000, 192000, 0x362931f5
-0, 240000, 192000, 0x362931f5
-0, 243000, 192000, 0x362931f5
-0, 246000, 192000, 0x362931f5
-0, 249000, 192000, 0x362931f5
-0, 252000, 192000, 0x362931f5
-0, 255000, 192000, 0x362931f5
-0, 258000, 192000, 0x362931f5
-0, 261000, 192000, 0x362931f5
-0, 264000, 192000, 0x362931f5
-0, 267000, 192000, 0x362931f5
-0, 270000, 192000, 0x362931f5
-0, 273000, 192000, 0x362931f5
-0, 276000, 192000, 0x362931f5
-0, 279000, 192000, 0x362931f5
-0, 282000, 192000, 0x362931f5
-0, 285000, 192000, 0x362931f5
-0, 288000, 192000, 0x362931f5
-0, 291000, 192000, 0x362931f5
-0, 294000, 192000, 0x362931f5
-0, 297000, 192000, 0x362931f5
-0, 300000, 192000, 0x362931f5
-0, 303000, 192000, 0x362931f5
-0, 306000, 192000, 0x362931f5
-0, 309000, 192000, 0xfb41331d
-0, 312000, 192000, 0x087433f8
-0, 315000, 192000, 0xf36b34a6
-0, 318000, 192000, 0x652a33cd
-0, 321000, 192000, 0x652a33cd
-0, 324000, 192000, 0xe50c336a
-0, 327000, 192000, 0x652a33cd
-0, 330000, 192000, 0xeed134c6
-0, 333000, 192000, 0x652a33cd
-0, 336000, 192000, 0x5d7633e5
-0, 339000, 192000, 0x845233b5
-0, 342000, 192000, 0x9d1c349b
-0, 345000, 192000, 0x25843317
-0, 348000, 192000, 0xc84b375c
-0, 351000, 192000, 0xaf2b3410
-0, 354000, 192000, 0xaf2b3410
-0, 357000, 192000, 0x26d23594
-0, 360000, 192000, 0xaf2b3410
-0, 363000, 192000, 0x26d23594
-0, 366000, 192000, 0xaf2b3410
-0, 369000, 192000, 0x72c4dfb9
-0, 372000, 192000, 0x3c72e390
-0, 375000, 192000, 0xb4466634
-0, 378000, 192000, 0x84f064f5
-0, 381000, 192000, 0xad43f3f5
-0, 384000, 192000, 0xa8644d57
-0, 387000, 192000, 0xfac35238
-0, 390000, 192000, 0xe9374d1e
-0, 393000, 192000, 0x0bd14cfa
-0, 396000, 192000, 0x7e51a437
-0, 399000, 192000, 0x92678dfa
-0, 402000, 192000, 0x43338d41
-0, 405000, 192000, 0x00000000
-0, 408000, 192000, 0x00000000
-0, 411000, 192000, 0x00000000
-0, 414000, 192000, 0x00000000
-0, 417000, 192000, 0x00000000
-0, 420000, 192000, 0x00000000
-0, 423000, 192000, 0x00000000
-0, 426000, 192000, 0x00000000
-0, 429000, 192000, 0x00000000
-0, 432000, 192000, 0x00000000
-0, 435000, 192000, 0x00000000
-0, 438000, 192000, 0x00000000
-0, 441000, 192000, 0x00000000
-0, 444000, 192000, 0x00000000
-0, 447000, 192000, 0x00000000
-0, 450000, 192000, 0x00000000
-0, 453000, 192000, 0x00000000
-0, 456000, 192000, 0x00000000
-0, 459000, 192000, 0x00000000
-0, 462000, 192000, 0x82a79641
+0, 213000, 192000, 0xfb41331d
+0, 216000, 192000, 0x087433f8
+0, 219000, 192000, 0xf36b34a6
+0, 222000, 192000, 0x652a33cd
+0, 225000, 192000, 0x652a33cd
+0, 228000, 192000, 0xe50c336a
+0, 231000, 192000, 0x652a33cd
+0, 234000, 192000, 0xeed134c6
+0, 237000, 192000, 0x652a33cd
+0, 240000, 192000, 0x5d7633e5
+0, 243000, 192000, 0x845233b5
+0, 246000, 192000, 0x9d1c349b
+0, 249000, 192000, 0x25843317
+0, 252000, 192000, 0xc84b375c
+0, 255000, 192000, 0xaf2b3410
+0, 258000, 192000, 0xaf2b3410
+0, 261000, 192000, 0x26d23594
+0, 264000, 192000, 0xaf2b3410
+0, 267000, 192000, 0x26d23594
+0, 270000, 192000, 0xaf2b3410
+0, 273000, 192000, 0x72c4dfb9
+0, 276000, 192000, 0x3c72e390
+0, 279000, 192000, 0xb4466634
+0, 282000, 192000, 0x84f064f5
+0, 285000, 192000, 0xad43f3f5
+0, 288000, 192000, 0xa8644d57
+0, 291000, 192000, 0xfac35238
+0, 294000, 192000, 0xe9374d1e
+0, 297000, 192000, 0x0bd14cfa
+0, 300000, 192000, 0x7e51a437
+0, 303000, 192000, 0x92678dfa
+0, 306000, 192000, 0x43338d41
+0, 309000, 192000, 0x00000000
+0, 312000, 192000, 0x00000000
+0, 315000, 192000, 0x00000000
+0, 318000, 192000, 0x00000000
+0, 321000, 192000, 0x00000000
+0, 324000, 192000, 0x00000000
+0, 327000, 192000, 0x00000000
+0, 330000, 192000, 0x00000000
+0, 333000, 192000, 0x00000000
+0, 336000, 192000, 0x00000000
+0, 339000, 192000, 0x00000000
+0, 342000, 192000, 0x00000000
+0, 345000, 192000, 0x00000000
+0, 348000, 192000, 0x00000000
+0, 351000, 192000, 0x00000000
+0, 354000, 192000, 0x00000000
+0, 357000, 192000, 0x00000000
+0, 360000, 192000, 0x00000000
+0, 363000, 192000, 0x00000000
+0, 366000, 192000, 0x82a79641