Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  build: cosmetics: Reorder some lists in a more logical fashion
  x86: pngdsp: Fix assembly for OS/2
  fate: add test for RTjpeg in nuv with frameheader
  rtmp: send check_bw as notification
  g723_1: clip argument for 15-bit version of normalize_bits()
  g723_1: use all LPC vectors in formant postfilter
  id3v2: Support v2.2 PIC
  avplay: fix build with lavfi disabled.
  avconv: split configuring filter configuration to a separate file.
  avconv: split option parsing into a separate file.
  mpc8: do not leave padding after last frame in buffer for the next decode call
  mpegaudioenc: list supported channel layouts.
  mpegaudiodec: don't print an error on > 1 frame in a packet.
  api-example: update to new audio encoding API.
  configure: add --enable/disable-random option
  doc: cygwin: Update list of FATE package requirements
  build: Remove all installed headers and header directories on uninstall
  build: change checkheaders to use regular build rules
  rtmp: Add a new option 'rtmp_subscribe'
  rtmp: Add support for subscribing live streams
  ...

Conflicts:
	Makefile
	common.mak
	configure
	doc/examples/decoding_encoding.c
	ffmpeg.c
	libavcodec/g723_1.c
	libavcodec/mpegaudiodec.c
	libavcodec/x86/pngdsp.asm
	libavformat/version.h
	library.mak
	tests/fate/video.mak

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

3 files changed, 53 insertions, 2 deletions

diff --git a/tests/ref/fate/acodec-g723_1 b/tests/ref/fate/acodec-g723_1
index 1060042..9f88a76 100644
--- a/tests/ref/fate/acodec-g723_1
+++ b/tests/ref/fate/acodec-g723_1
@@ -1,4 +1,4 @@
 dec0deb2425e908d232d2471acff04a3 *tests/data/fate/acodec-g723_1.g723_1
 4800 tests/data/fate/acodec-g723_1.g723_1
-87fd529c9e41914f73a865d147cc9516 *tests/data/fate/acodec-g723_1.out.wav
-stddev: 8425.98 PSNR: 17.82 MAXDIFF:53268 bytes:    95992/    96000
+d70776846d77c652bceed281fcca9cc8 *tests/data/fate/acodec-g723_1.out.wav
+stddev: 8423.47 PSNR: 17.82 MAXDIFF:53292 bytes:    95992/    96000
diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv-rtjpeg
index 8838fbb..8838fbb 100644
--- a/tests/ref/fate/nuv
+++ b/tests/ref/fate/nuv-rtjpeg
diff --git a/tests/ref/fate/nuv-rtjpeg-fh b/tests/ref/fate/nuv-rtjpeg-fh
new file mode 100644
index 0000000..151ef88
--- /dev/null
+++ b/tests/ref/fate/nuv-rtjpeg-fh
@@ -0,0 +1,51 @@
+#tb 0: 1/50
+0,          0,          0,        1,   221184, 0xf48c94f6
+0,          2,          2,        1,   221184, 0x89b625b2
+0,          3,          3,        1,   221184, 0x37e04714
+0,          4,          4,        1,   221184, 0x4f4c5224
+0,          5,          5,        1,   221184, 0x9193c9f1
+0,          6,          6,        1,   221184, 0x5d1a6197
+0,          7,          7,        1,   221184, 0x40cd51e7
+0,          8,          8,        1,   221184, 0xb2c1a729
+0,         10,         10,        1,   221184, 0x998d6144
+0,         11,         11,        1,   221184, 0xf5d52311
+0,         12,         12,        1,   221184, 0xea9dd6bf
+0,         13,         13,        1,   221184, 0x0e2ed854
+0,         14,         14,        1,   221184, 0xe295ba58
+0,         15,         15,        1,   221184, 0x8aedbb69
+0,         16,         16,        1,   221184, 0x253c9aaa
+0,         17,         17,        1,   221184, 0x5eaf9fb1
+0,         18,         18,        1,   221184, 0xcdb5a0cb
+0,         19,         19,        1,   221184, 0xcdb5a0cb
+0,         20,         20,        1,   221184, 0x23f89994
+0,         21,         21,        1,   221184, 0x23f89994
+0,         22,         22,        1,   221184, 0x10dc98d6
+0,         23,         23,        1,   221184, 0x799b9d98
+0,         24,         24,        1,   221184, 0xb226996c
+0,         25,         25,        1,   221184, 0x0ac59a42
+0,         26,         26,        1,   221184, 0x87c2a654
+0,         27,         27,        1,   221184, 0xf4c1a711
+0,         28,         28,        1,   221184, 0xf60fa72e
+0,         29,         29,        1,   221184, 0xc8f8b6fc
+0,         30,         30,        1,   221184, 0xd709b813
+0,         31,         31,        1,   221184, 0x5fdfb76b
+0,         32,         32,        1,   221184, 0x5798b0aa
+0,         33,         33,        1,   221184, 0xf572b1c3
+0,         34,         34,        1,   221184, 0x14b0afdf
+0,         35,         35,        1,   221184, 0x0a66b5b8
+0,         36,         36,        1,   221184, 0xe316c620
+0,         37,         37,        1,   221184, 0xbc76c5c2
+0,         38,         38,        1,   221184, 0x77c7c5e5
+0,         39,         39,        1,   221184, 0xfc7ac63e
+0,         40,         40,        1,   221184, 0x05a29ffe
+0,         41,         41,        1,   221184, 0x9bffbf6c
+0,         42,         42,        1,   221184, 0x3c55be40
+0,         43,         43,        1,   221184, 0x6f46c14e
+0,         44,         44,        1,   221184, 0x9cf4ae70
+0,         45,         45,        1,   221184, 0xf205b2f8
+0,         46,         46,        1,   221184, 0x7180aff8
+0,         47,         47,        1,   221184, 0x125eaffe
+0,         48,         48,        1,   221184, 0x6970a32d
+0,         49,         49,        1,   221184, 0xaea79f62
+0,         50,         50,        1,   221184, 0x48d2a093
+0,         51,         51,        1,   221184, 0x10a59eb5