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, 30 insertions, 39 deletions

diff --git a/tests/ref/fate/mpeg2-field-enc b/tests/ref/fate/mpeg2-field-enc
index c8ee4cfba0..9ae5d62bf0 100644
--- a/tests/ref/fate/mpeg2-field-enc
+++ b/tests/ref/fate/mpeg2-field-enc
@@ -1,40 +1,31 @@
 0, 0, 622080, 0xb3b66c5c
-0, 3600, 622080, 0xb3b66c5c
-0, 7200, 622080, 0xb3b66c5c
-0, 10800, 622080, 0xb3b66c5c
-0, 14400, 622080, 0xb3b66c5c
-0, 18000, 622080, 0xb3b66c5c
-0, 21600, 622080, 0xb3b66c5c
-0, 25200, 622080, 0xb3b66c5c
-0, 28800, 622080, 0xb3b66c5c
-0, 32400, 622080, 0xb3b66c5c
-0, 36000, 622080, 0x088ec02b
-0, 39600, 622080, 0x7a36db21
-0, 43200, 622080, 0x541b286f
-0, 46800, 622080, 0xb6c3e590
-0, 50400, 622080, 0x39dbed51
-0, 54000, 622080, 0x973dc728
-0, 57600, 622080, 0xd7a4f804
-0, 61200, 622080, 0xa2484762
-0, 64800, 622080, 0x0cd268d1
-0, 68400, 622080, 0x72eb663d
-0, 72000, 622080, 0x8fdbac59
-0, 75600, 622080, 0xa6f4feb9
-0, 79200, 622080, 0xadb828c6
-0, 82800, 622080, 0xea630a63
-0, 86400, 622080, 0xa901d925
-0, 90000, 622080, 0xac5e7087
-0, 93600, 622080, 0x10274a2b
-0, 97200, 622080, 0x143d541c
-0, 100800, 622080, 0xee94c93a
-0, 104400, 622080, 0xca030208
-0, 108000, 622080, 0x26f30ead
-0, 111600, 622080, 0xfc22f32c
-0, 115200, 622080, 0x940a5ff8
-0, 118800, 622080, 0x2164f805
-0, 122400, 622080, 0xa76f5aba
-0, 126000, 622080, 0x8c311471
-0, 129600, 622080, 0xa45e1d95
-0, 133200, 622080, 0x6cc61d6c
-0, 136800, 622080, 0x6983b417
-0, 140400, 622080, 0x982363c0
+0, 3600, 622080, 0x088ec02b
+0, 7200, 622080, 0x7a36db21
+0, 10800, 622080, 0x541b286f
+0, 14400, 622080, 0xb6c3e590
+0, 18000, 622080, 0x39dbed51
+0, 21600, 622080, 0x973dc728
+0, 25200, 622080, 0xd7a4f804
+0, 28800, 622080, 0xa2484762
+0, 32400, 622080, 0x0cd268d1
+0, 36000, 622080, 0x72eb663d
+0, 39600, 622080, 0x8fdbac59
+0, 43200, 622080, 0xa6f4feb9
+0, 46800, 622080, 0xadb828c6
+0, 50400, 622080, 0xea630a63
+0, 54000, 622080, 0xa901d925
+0, 57600, 622080, 0xac5e7087
+0, 61200, 622080, 0x10274a2b
+0, 64800, 622080, 0x143d541c
+0, 68400, 622080, 0xee94c93a
+0, 72000, 622080, 0xca030208
+0, 75600, 622080, 0x26f30ead
+0, 79200, 622080, 0xfc22f32c
+0, 82800, 622080, 0x940a5ff8
+0, 86400, 622080, 0x2164f805
+0, 90000, 622080, 0xa76f5aba
+0, 93600, 622080, 0x8c311471
+0, 97200, 622080, 0xa45e1d95
+0, 100800, 622080, 0x6cc61d6c
+0, 104400, 622080, 0x6983b417
+0, 108000, 622080, 0x982363c0