Merge remote branch 'qatar/master'

* qatar/master: (33 commits)
  rtpdec_qdm2: Don't try to parse data packet if no configuration is received
  ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand.
  ac3enc: clean up count_frame_bits() and count_frame_bits_fixed()
  mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame.
  srtdec: make sure we don't write past the end of buffer
  wmaenc: improve channel count and bitrate error handling in encode_init()
  matroskaenc: make sure we don't produce invalid file with no codec ID
  matroskadec: check that pointers were initialized before accessing them
  lavf: fix function name in compute_pkt_fields2 av_dlog message
  lavf: fix av_find_best_stream when providing a wanted stream.
  lavf: fix av_find_best_stream when decoder_ret is given and using a related stream.
  ffmpeg: factorize quality calculation
  tiff: add support for SamplesPerPixel tag in tiff_decode_tag()
  tiff: Prefer enum TiffCompr over int for TiffContext.compr.
  mov: Support edit list atom version 1.
  configure: Enable libpostproc automatically if GPL code is enabled.
  Cosmetics: fix prototypes in oggdec
  oggdec: fix memleak with continuous streams.
  matroskaenc: add missing new line in av_log() call
  dnxhdenc: add AVClass in private context.
  ...

swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code.
Above code is also just in case its not obvios to a large extended duplicates that where cherry picked
from ffmpeg.

Conflicts:
	configure
	ffmpeg.c
	libavformat/matroskaenc.c
	libavutil/pixfmt.h
	libswscale/ppc/swscale_template.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/fate/h264.mak
	tests/ref/lavfi/pixdesc_le
	tests/ref/lavfi/pixfmts_copy_le
	tests/ref/lavfi/pixfmts_null_le
	tests/ref/lavfi/pixfmts_scale_le
	tests/ref/lavfi/pixfmts_vflip_le

Merged-by: Michael Niedermayer <michaelni@gmx.at>

7 files changed, 79 insertions, 79 deletions

diff --git a/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
index d25653dce7..1cfc313e32 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
@@ -1,10 +1,10 @@
-0, 0, 2764800, 0xf69f33f5
-0, 3600, 2764800, 0x8d602e2f
-0, 7200, 2764800, 0xe2111955
-0, 10800, 2764800, 0xbbe76d10
-0, 14400, 2764800, 0x81cbbb10
-0, 18000, 2764800, 0xb5259536
-0, 21600, 2764800, 0x4972ded4
-0, 25200, 2764800, 0xc726c878
-0, 28800, 2764800, 0xd8a2b4fc
-0, 32400, 2764800, 0xaa4b80f7
+0, 0, 2764800, 0xcc4df07d
+0, 3600, 2764800, 0x85f9e6d4
+0, 7200, 2764800, 0x23ffe90d
+0, 10800, 2764800, 0xf0a6d453
+0, 14400, 2764800, 0x913a6392
+0, 18000, 2764800, 0xcc5f9736
+0, 21600, 2764800, 0x43f9f9ce
+0, 25200, 2764800, 0xc874b44e
+0, 28800, 2764800, 0x83b665e6
+0, 32400, 2764800, 0x5ea2e31e
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
index 04d044a28d..274bdaf2b1 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
@@ -1,10 +1,10 @@
-0, 0, 2764800, 0x8c3e963e
-0, 3600, 2764800, 0xa1b0f891
-0, 7200, 2764800, 0xcd090f45
-0, 10800, 2764800, 0x2df70987
-0, 14400, 2764800, 0x66d22478
-0, 18000, 2764800, 0x64b0ddef
-0, 21600, 2764800, 0xdd86fb62
-0, 25200, 2764800, 0x36fc36d4
-0, 28800, 2764800, 0xee32176f
-0, 32400, 2764800, 0x99c649b5
+0, 0, 2764800, 0x4f710132
+0, 3600, 2764800, 0x57e5b713
+0, 7200, 2764800, 0xcca01477
+0, 10800, 2764800, 0xa19a95cd
+0, 14400, 2764800, 0x700a757d
+0, 18000, 2764800, 0xd8c6f60f
+0, 21600, 2764800, 0x95a1bbc7
+0, 25200, 2764800, 0x0582077a
+0, 28800, 2764800, 0x91595f91
+0, 32400, 2764800, 0xf5fe034a
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
index 9290354652..195e45a67b 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
@@ -1,10 +1,10 @@
-0, 0, 2764800, 0xe4289a64
-0, 3600, 2764800, 0x01ea4677
-0, 7200, 2764800, 0x7c1b00f4
-0, 10800, 2764800, 0xf51a4695
-0, 14400, 2764800, 0xe1dd8ace
-0, 18000, 2764800, 0xe9fd1996
-0, 21600, 2764800, 0x083ce1db
-0, 25200, 2764800, 0x2c5bc489
-0, 28800, 2764800, 0xb6d10e63
-0, 32400, 2764800, 0x813daf47
+0, 0, 2764800, 0xda69f69e
+0, 3600, 2764800, 0x29ed832f
+0, 7200, 2764800, 0xb3244cc4
+0, 10800, 2764800, 0xe41a312c
+0, 14400, 2764800, 0xac0b344b
+0, 18000, 2764800, 0xc585aa20
+0, 21600, 2764800, 0x0952054c
+0, 25200, 2764800, 0xd1a02f87
+0, 28800, 2764800, 0xfcbfe87c
+0, 32400, 2764800, 0xe4e9b8a2
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
index 646c0da4fb..d351a7eb1f 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
@@ -1,19 +1,19 @@
-0, 0, 6220800, 0x26bc0f20
-0, 3600, 6220800, 0x69acba0c
-0, 7200, 6220800, 0x10d17202
-0, 10800, 6220800, 0x790d98f1
-0, 14400, 6220800, 0x71fe35c2
-0, 18000, 6220800, 0xc9d345cb
-0, 21600, 6220800, 0xcb4bad2e
-0, 25200, 6220800, 0x01604385
-0, 28800, 6220800, 0xe585bb5f
-0, 32400, 6220800, 0xc9d345cb
-0, 36000, 6220800, 0x2bdf0dd0
-0, 39600, 6220800, 0x79794ac4
-0, 43200, 6220800, 0x106afcdf
-0, 46800, 6220800, 0xc9d345cb
-0, 50400, 6220800, 0x106afcdf
-0, 54000, 6220800, 0xc9d345cb
-0, 57600, 6220800, 0x106afcdf
-0, 61200, 6220800, 0xc9d345cb
-0, 64800, 6220800, 0xf0b8dde0
+0, 0, 6220800, 0xca2a2a5e
+0, 3600, 6220800, 0x8009a65e
+0, 7200, 6220800, 0x63e72b3b
+0, 10800, 6220800, 0x7459a1cc
+0, 14400, 6220800, 0x02191aa9
+0, 18000, 6220800, 0x88dca590
+0, 21600, 6220800, 0x56dd150a
+0, 25200, 6220800, 0x5f56a56f
+0, 28800, 6220800, 0x67ada4b7
+0, 32400, 6220800, 0x88dca590
+0, 36000, 6220800, 0xd3b09fe5
+0, 39600, 6220800, 0x2223998c
+0, 43200, 6220800, 0x5e5b2da5
+0, 46800, 6220800, 0x88dca590
+0, 50400, 6220800, 0x5e5b2da5
+0, 54000, 6220800, 0x88dca590
+0, 57600, 6220800, 0x5e5b2da5
+0, 61200, 6220800, 0x88dca590
+0, 64800, 6220800, 0x26e1ec8b
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
index 042825e8b8..1afbac01e7 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
@@ -1,10 +1,10 @@
-0, 0, 6220800, 0x77a0ee6a
-0, 3600, 6220800, 0x1850d87c
-0, 7200, 6220800, 0x116ac02c
-0, 10800, 6220800, 0xb834fb9d
-0, 14400, 6220800, 0xabfae062
-0, 18000, 6220800, 0x717845a7
-0, 21600, 6220800, 0xb246fc4b
-0, 25200, 6220800, 0x2cf2769d
-0, 28800, 6220800, 0xf8ac6a4a
-0, 32400, 6220800, 0xfa278467
+0, 0, 6220800, 0x1df58ce9
+0, 3600, 6220800, 0x8f2859ce
+0, 7200, 6220800, 0x229cc7ff
+0, 10800, 6220800, 0x73e86984
+0, 14400, 6220800, 0xb6d4504b
+0, 18000, 6220800, 0x4e7d4883
+0, 21600, 6220800, 0xbec3f0f7
+0, 25200, 6220800, 0x1d9af065
+0, 28800, 6220800, 0x44851549
+0, 32400, 6220800, 0xfcf8728e
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
index 1b1dce984e..6d105466c9 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
@@ -1,10 +1,10 @@
-0, 0, 6220800, 0x738b0778
-0, 3600, 6220800, 0x04821310
-0, 7200, 6220800, 0x4837f3d9
-0, 10800, 6220800, 0x5e246bfe
-0, 14400, 6220800, 0xdb46d88c
-0, 18000, 6220800, 0x74b67352
-0, 21600, 6220800, 0x1cdb5be8
-0, 25200, 6220800, 0x2d5e5f1e
-0, 28800, 6220800, 0x429c5928
-0, 32400, 6220800, 0x8e227f6c
+0, 0, 6220800, 0x408daf70
+0, 3600, 6220800, 0x59b254a3
+0, 7200, 6220800, 0x4cf4279c
+0, 10800, 6220800, 0x5c9437ae
+0, 14400, 6220800, 0x986c3eb8
+0, 18000, 6220800, 0x23fd883e
+0, 21600, 6220800, 0x84f222fe
+0, 25200, 6220800, 0xe7f91107
+0, 28800, 6220800, 0xb544b31e
+0, 32400, 6220800, 0x1ebdde56
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
index 0ca78c155f..28825446f9 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
@@ -1,10 +1,10 @@
-0, 0, 6220800, 0x6616177e
-0, 3600, 6220800, 0xf3fe7a1c
-0, 7200, 6220800, 0x44f0fab6
-0, 10800, 6220800, 0x109ff851
-0, 14400, 6220800, 0x9501f055
-0, 18000, 6220800, 0x603d6e3d
-0, 21600, 6220800, 0x42126cfb
-0, 25200, 6220800, 0x113169e8
-0, 28800, 6220800, 0xe8f64949
-0, 32400, 6220800, 0x89488caf
+0, 0, 6220800, 0xf81873fe
+0, 3600, 6220800, 0x7b96fbdc
+0, 7200, 6220800, 0x75dbafc4
+0, 10800, 6220800, 0x7524301e
+0, 14400, 6220800, 0x0f3621ab
+0, 18000, 6220800, 0xa5e25b35
+0, 21600, 6220800, 0x063a8116
+0, 25200, 6220800, 0x48ebc8ff
+0, 28800, 6220800, 0x1f635df8
+0, 32400, 6220800, 0xe282c8bd