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, 108 insertions, 217 deletions

diff --git a/tests/ref/fate/film-cvid-pcm-stereo-8bit b/tests/ref/fate/film-cvid-pcm-stereo-8bit
index c8d573ca33..4f3fcf4689 100644
--- a/tests/ref/fate/film-cvid-pcm-stereo-8bit
+++ b/tests/ref/fate/film-cvid-pcm-stereo-8bit
@@ -1,248 +1,139 @@
 0, 0, 107520, 0xa6c9fdd2
 1, 0, 88192, 0x23bb50ae
 0, 3000, 107520, 0x61eb28c1
-0, 6000, 107520, 0x61eb28c1
-0, 9000, 107520, 0x45e20af7
-0, 12000, 107520, 0x45e20af7
-0, 15000, 107520, 0x366970fc
-0, 18000, 107520, 0x366970fc
-0, 21000, 107520, 0xa392bcb3
-0, 24000, 107520, 0xa392bcb3
-0, 27000, 107520, 0xcf7bac98
-0, 30000, 107520, 0xcf7bac98
-0, 33000, 107520, 0x222eba53
-0, 36000, 107520, 0x222eba53
-0, 39000, 107520, 0x74e255a1
-0, 42000, 107520, 0x74e255a1
+0, 6000, 107520, 0x45e20af7
+0, 9000, 107520, 0x366970fc
+0, 12000, 107520, 0xa392bcb3
+0, 15000, 107520, 0xcf7bac98
+0, 18000, 107520, 0x222eba53
+0, 21000, 107520, 0x74e255a1
+0, 24000, 107520, 0xc19eec6f
+0, 27000, 107520, 0xa3880681
+0, 30000, 107520, 0x957878db
+0, 33000, 107520, 0x18340692
+0, 36000, 107520, 0x9970f24d
+0, 39000, 107520, 0xf08618aa
+0, 42000, 107520, 0xee7324f0
 1, 44996, 44112, 0x79600f01
-0, 45000, 107520, 0xc19eec6f
-0, 48000, 107520, 0xc19eec6f
-0, 51000, 107520, 0xa3880681
-0, 54000, 107520, 0xa3880681
-0, 57000, 107520, 0x957878db
-0, 60000, 107520, 0x957878db
-0, 63000, 107520, 0x18340692
-0, 66000, 107520, 0x18340692
+0, 45000, 107520, 0xe15025b3
+0, 48000, 107520, 0x8afa312e
+0, 51000, 107520, 0x717a7d0f
+0, 54000, 107520, 0x355c6e23
+0, 57000, 107520, 0x7015a50f
+0, 60000, 107520, 0xcdfc1a16
+0, 63000, 107520, 0x38d929e7
+0, 66000, 107520, 0x52913423
 1, 67502, 44096, 0x09dbf7aa
-0, 69000, 107520, 0x9970f24d
-0, 72000, 107520, 0x9970f24d
-0, 75000, 107520, 0xf08618aa
-0, 78000, 107520, 0xf08618aa
-0, 81000, 107520, 0xee7324f0
-0, 84000, 107520, 0xee7324f0
-0, 87000, 107520, 0xe15025b3
-0, 90000, 107520, 0xe15025b3
+0, 69000, 107520, 0xe2c91c10
+0, 72000, 107520, 0x85516e9c
+0, 75000, 107520, 0xd1626030
+0, 78000, 107520, 0xea7b16de
+0, 81000, 107520, 0xa33eaa0d
+0, 84000, 107520, 0x8e3be6a6
+0, 87000, 107520, 0x14147bd6
+0, 90000, 107520, 0x07d54bec
 1, 90000, 44112, 0x18fed048
-0, 93000, 107520, 0x8afa312e
-0, 96000, 107520, 0x8afa312e
-0, 99000, 107520, 0x717a7d0f
-0, 102000, 107520, 0x717a7d0f
-0, 105000, 107520, 0x355c6e23
-0, 108000, 107520, 0x355c6e23
-0, 111000, 107520, 0x7015a50f
+0, 93000, 107520, 0xe287a0a7
+0, 96000, 107520, 0xc023a14d
+0, 99000, 107520, 0x2437085d
+0, 102000, 107520, 0x63823918
+0, 105000, 107520, 0xbc17e198
+0, 108000, 107520, 0x9d99bc81
+0, 111000, 107520, 0x7e4ec71e
 1, 112506, 44112, 0x030d35ef
-0, 114000, 107520, 0x7015a50f
-0, 117000, 107520, 0xcdfc1a16
-0, 120000, 107520, 0xcdfc1a16
-0, 123000, 107520, 0x38d929e7
-0, 126000, 107520, 0x38d929e7
-0, 129000, 107520, 0x52913423
-0, 132000, 107520, 0x52913423
-0, 135000, 107520, 0xe2c91c10
+0, 114000, 107520, 0x55b98376
+0, 117000, 107520, 0x356d8e9e
+0, 120000, 107520, 0xf77e8a61
+0, 123000, 107520, 0x5ae7c8c7
+0, 126000, 107520, 0x8acf9322
+0, 129000, 107520, 0x40a9177e
+0, 132000, 107520, 0x3e0e4d8d
+0, 135000, 107520, 0xd268865b
 1, 135012, 44112, 0xc23154d5
-0, 138000, 107520, 0xe2c91c10
-0, 141000, 107520, 0x85516e9c
-0, 144000, 107520, 0x85516e9c
-0, 147000, 107520, 0xd1626030
-0, 150000, 107520, 0xd1626030
-0, 153000, 107520, 0xea7b16de
-0, 156000, 107520, 0xea7b16de
+0, 138000, 107520, 0x89a4efeb
+0, 141000, 107520, 0x70ca2478
+0, 144000, 107520, 0xcc9ec981
+0, 147000, 107520, 0xf0648459
+0, 150000, 107520, 0x7e4a4cca
+0, 153000, 107520, 0xb315dc65
+0, 156000, 107520, 0x2aecc7b4
 1, 157518, 44064, 0xe4713ee7
-0, 159000, 107520, 0xa33eaa0d
-0, 162000, 107520, 0xa33eaa0d
-0, 165000, 107520, 0x8e3be6a6
-0, 168000, 107520, 0x8e3be6a6
-0, 171000, 107520, 0x14147bd6
-0, 174000, 107520, 0x14147bd6
-0, 177000, 107520, 0x07d54bec
-0, 180000, 107520, 0x07d54bec
+0, 159000, 107520, 0x81742f51
+0, 162000, 107520, 0x3a1d7571
+0, 165000, 107520, 0x3a1d7571
+0, 168000, 107520, 0x3a1d7571
+0, 171000, 107520, 0x3a1d7571
+0, 174000, 107520, 0x3a1d7571
+0, 177000, 107520, 0x3a1d7571
+0, 180000, 107520, 0x3a1d7571
 1, 180000, 44112, 0xddc19d91
-0, 183000, 107520, 0xe287a0a7
-0, 186000, 107520, 0xe287a0a7
-0, 189000, 107520, 0xc023a14d
-0, 192000, 107520, 0xc023a14d
-0, 195000, 107520, 0x2437085d
-0, 198000, 107520, 0x2437085d
-0, 201000, 107520, 0x63823918
+0, 183000, 107520, 0xe974733e
+0, 186000, 107520, 0x999c6fbf
+0, 189000, 107520, 0x26b56b6e
+0, 192000, 107520, 0xc9f9647b
+0, 195000, 107520, 0x6d025d00
+0, 198000, 107520, 0xf9c056c1
+0, 201000, 107520, 0xa5cc4d0b
 1, 202506, 44112, 0x9591522d
-0, 204000, 107520, 0x63823918
-0, 207000, 107520, 0xbc17e198
-0, 210000, 107520, 0xbc17e198
-0, 213000, 107520, 0x9d99bc81
-0, 216000, 107520, 0x9d99bc81
-0, 219000, 107520, 0x7e4ec71e
-0, 222000, 107520, 0x7e4ec71e
-0, 225000, 107520, 0x55b98376
+0, 204000, 107520, 0x1a4c4236
+0, 207000, 107520, 0xa9d538b6
+0, 210000, 107520, 0x14682d00
+0, 213000, 107520, 0x6236204f
+0, 216000, 107520, 0x303e14aa
+0, 219000, 107520, 0x943b0837
+0, 222000, 107520, 0xfce5fd07
+0, 225000, 107520, 0xd993f193
 1, 225012, 44112, 0x90deb013
-0, 228000, 107520, 0x55b98376
-0, 231000, 107520, 0x356d8e9e
-0, 234000, 107520, 0x356d8e9e
-0, 237000, 107520, 0xf77e8a61
-0, 240000, 107520, 0xf77e8a61
-0, 243000, 107520, 0x5ae7c8c7
-0, 246000, 107520, 0x5ae7c8c7
+0, 228000, 107520, 0x4d48e7b4
+0, 231000, 107520, 0x61ccdf83
+0, 234000, 107520, 0xfb4fd608
+0, 237000, 107520, 0x5efdcdb3
+0, 240000, 107520, 0xb03ec886
+0, 243000, 107520, 0xf464c343
+0, 246000, 107520, 0xf464c343
 1, 247518, 44064, 0x3842d420
-0, 249000, 107520, 0x8acf9322
-0, 252000, 107520, 0x8acf9322
-0, 255000, 107520, 0x40a9177e
-0, 258000, 107520, 0x40a9177e
-0, 261000, 107520, 0x3e0e4d8d
-0, 264000, 107520, 0x3e0e4d8d
-0, 267000, 107520, 0xd268865b
-0, 270000, 107520, 0xd268865b
+0, 249000, 107520, 0xf464c343
+0, 252000, 107520, 0xf464c343
+0, 255000, 107520, 0xf464c343
+0, 258000, 107520, 0xf464c343
+0, 261000, 107520, 0xf464c343
+0, 264000, 107520, 0xf464c343
+0, 267000, 107520, 0xf464c343
+0, 270000, 107520, 0xf464c343
 1, 270000, 44112, 0x99c8c3d9
-0, 273000, 107520, 0x89a4efeb
-0, 276000, 107520, 0x89a4efeb
-0, 279000, 107520, 0x70ca2478
-0, 282000, 107520, 0x70ca2478
-0, 285000, 107520, 0xcc9ec981
-0, 288000, 107520, 0xcc9ec981
-0, 291000, 107520, 0xf0648459
+0, 273000, 107520, 0xf464c343
+0, 276000, 107520, 0xf2b2c712
+0, 279000, 107520, 0xf2b2c712
+0, 282000, 107520, 0xf2b2c712
+0, 285000, 107520, 0xf2b2c712
+0, 288000, 107520, 0xb95e6bc8
+0, 291000, 107520, 0x33feee37
 1, 292506, 44112, 0xffaf3824
-0, 294000, 107520, 0xf0648459
-0, 297000, 107520, 0x7e4a4cca
-0, 300000, 107520, 0x7e4a4cca
-0, 303000, 107520, 0xb315dc65
-0, 306000, 107520, 0xb315dc65
-0, 309000, 107520, 0x2aecc7b4
-0, 312000, 107520, 0x2aecc7b4
-0, 315000, 107520, 0x81742f51
+0, 294000, 107520, 0x36ee3cd5
+0, 297000, 107520, 0x59096471
+0, 300000, 107520, 0x53b470c6
+0, 303000, 107520, 0xdb7c64ff
+0, 306000, 107520, 0xe5a1596a
+0, 309000, 107520, 0x8c8942eb
+0, 312000, 107520, 0x5ecc379e
+0, 315000, 107520, 0xea09432a
 1, 315012, 44112, 0x3dbe1aef
-0, 318000, 107520, 0x81742f51
-0, 321000, 107520, 0x3a1d7571
-0, 324000, 107520, 0x3a1d7571
-0, 327000, 107520, 0x3a1d7571
-0, 330000, 107520, 0x3a1d7571
-0, 333000, 107520, 0x3a1d7571
-0, 336000, 107520, 0x3a1d7571
+0, 318000, 107520, 0xe01e6b73
+0, 321000, 107520, 0x1d13bba8
+0, 324000, 107520, 0x3a993a6c
+0, 327000, 107520, 0x2ede041a
 1, 337518, 44064, 0xed2c7dfb
-0, 339000, 107520, 0x3a1d7571
-0, 342000, 107520, 0x3a1d7571
-0, 345000, 107520, 0x3a1d7571
-0, 348000, 107520, 0x3a1d7571
-0, 351000, 107520, 0x3a1d7571
-0, 354000, 107520, 0x3a1d7571
-0, 357000, 107520, 0x3a1d7571
-0, 360000, 107520, 0x3a1d7571
 1, 360000, 44112, 0x9e475274
-0, 363000, 107520, 0xe974733e
-0, 366000, 107520, 0xe974733e
-0, 369000, 107520, 0x999c6fbf
-0, 372000, 107520, 0x999c6fbf
-0, 375000, 107520, 0x26b56b6e
-0, 378000, 107520, 0x26b56b6e
-0, 381000, 107520, 0xc9f9647b
 1, 382506, 44112, 0x541f05d4
-0, 384000, 107520, 0xc9f9647b
-0, 387000, 107520, 0x6d025d00
-0, 390000, 107520, 0x6d025d00
-0, 393000, 107520, 0xf9c056c1
-0, 396000, 107520, 0xf9c056c1
-0, 399000, 107520, 0xa5cc4d0b
-0, 402000, 107520, 0xa5cc4d0b
-0, 405000, 107520, 0x1a4c4236
 1, 405012, 44112, 0x09e39025
-0, 408000, 107520, 0x1a4c4236
-0, 411000, 107520, 0xa9d538b6
-0, 414000, 107520, 0xa9d538b6
-0, 417000, 107520, 0x14682d00
-0, 420000, 107520, 0x14682d00
-0, 423000, 107520, 0x6236204f
-0, 426000, 107520, 0x6236204f
 1, 427518, 44064, 0xdc111087
-0, 429000, 107520, 0x303e14aa
-0, 432000, 107520, 0x303e14aa
-0, 435000, 107520, 0x943b0837
-0, 438000, 107520, 0x943b0837
-0, 441000, 107520, 0xfce5fd07
-0, 444000, 107520, 0xfce5fd07
-0, 447000, 107520, 0xd993f193
-0, 450000, 107520, 0xd993f193
 1, 450000, 44112, 0xb8f86e48
-0, 453000, 107520, 0x4d48e7b4
-0, 456000, 107520, 0x4d48e7b4
-0, 459000, 107520, 0x61ccdf83
-0, 462000, 107520, 0x61ccdf83
-0, 465000, 107520, 0xfb4fd608
-0, 468000, 107520, 0xfb4fd608
-0, 471000, 107520, 0x5efdcdb3
 1, 472506, 44112, 0xa1e0c75c
-0, 474000, 107520, 0x5efdcdb3
-0, 477000, 107520, 0xb03ec886
-0, 480000, 107520, 0xb03ec886
-0, 483000, 107520, 0xf464c343
-0, 486000, 107520, 0xf464c343
-0, 489000, 107520, 0xf464c343
-0, 492000, 107520, 0xf464c343
-0, 495000, 107520, 0xf464c343
 1, 495012, 44112, 0x0654dcb0
-0, 498000, 107520, 0xf464c343
-0, 501000, 107520, 0xf464c343
-0, 504000, 107520, 0xf464c343
-0, 507000, 107520, 0xf464c343
-0, 510000, 107520, 0xf464c343
-0, 513000, 107520, 0xf464c343
-0, 516000, 107520, 0xf464c343
 1, 517518, 44064, 0xb921e11a
-0, 519000, 107520, 0xf464c343
-0, 522000, 107520, 0xf464c343
-0, 525000, 107520, 0xf464c343
-0, 528000, 107520, 0xf464c343
-0, 531000, 107520, 0xf464c343
-0, 534000, 107520, 0xf464c343
-0, 537000, 107520, 0xf464c343
-0, 540000, 107520, 0xf464c343
 1, 540000, 44112, 0xe0ac619f
-0, 543000, 107520, 0xf464c343
-0, 546000, 107520, 0xf464c343
-0, 549000, 107520, 0xf2b2c712
-0, 552000, 107520, 0xf2b2c712
-0, 555000, 107520, 0xf2b2c712
-0, 558000, 107520, 0xf2b2c712
-0, 561000, 107520, 0xf2b2c712
 1, 562506, 44112, 0xb07aa65c
-0, 564000, 107520, 0xf2b2c712
-0, 567000, 107520, 0xf2b2c712
-0, 570000, 107520, 0xf2b2c712
-0, 573000, 107520, 0xb95e6bc8
-0, 576000, 107520, 0xb95e6bc8
-0, 579000, 107520, 0x33feee37
-0, 582000, 107520, 0x33feee37
-0, 585000, 107520, 0x36ee3cd5
 1, 585012, 44112, 0x24610ff0
-0, 588000, 107520, 0x36ee3cd5
-0, 591000, 107520, 0x59096471
-0, 594000, 107520, 0x59096471
-0, 597000, 107520, 0x53b470c6
-0, 600000, 107520, 0x53b470c6
-0, 603000, 107520, 0xdb7c64ff
-0, 606000, 107520, 0xdb7c64ff
 1, 607518, 44064, 0x00000000
-0, 609000, 107520, 0xe5a1596a
-0, 612000, 107520, 0xe5a1596a
-0, 615000, 107520, 0x8c8942eb
-0, 618000, 107520, 0x8c8942eb
-0, 621000, 107520, 0x5ecc379e
-0, 624000, 107520, 0x5ecc379e
-0, 627000, 107520, 0xea09432a
-0, 630000, 107520, 0xea09432a
 1, 630000, 44112, 0x00000000
-0, 633000, 107520, 0xe01e6b73
-0, 636000, 107520, 0xe01e6b73
-0, 639000, 107520, 0x1d13bba8
-0, 642000, 107520, 0x1d13bba8
-0, 645000, 107520, 0x3a993a6c
-0, 648000, 107520, 0x3a993a6c
-0, 651000, 107520, 0x2ede041a
 1, 652506, 8800, 0x00000000
-0, 654000, 107520, 0x2ede041a