Merge remote-tracking branch 'qatar/master'

* qatar/master: (58 commits)
  amrnbdec: check frame size before decoding.
  cscd: use negative error values to indicate decode_init() failures.
  h264: prevent overreads in intra PCM decoding.
  FATE: do not decode audio in the nuv test.
  dxa: set audio stream time base using the sample rate
  psx-str: do not allow seeking by bytes
  asfdec: Do not set AVCodecContext.frame_size
  vqf: set packet parameters after av_new_packet()
  mpegaudiodec: use DSPUtil.butterflies_float().
  FATE: add mp3 test for sample that exhibited false overreads
  fate: add cdxl test for bit line plane arrangement
  vmnc: return error on decode_init() failure.
  libvorbis: add/update error messages
  libvorbis: use AVFifoBuffer for output packet buffer
  libvorbis: remove unneeded e_o_s check
  libvorbis: check return values for functions that can return errors
  libvorbis: use float input instead of s16
  libvorbis: do not flush libvorbis analysis if dsp state was not initialized
  libvorbis: use VBR by default, with default quality of 3
  libvorbis: fix use of minrate/maxrate AVOptions
  ...

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/dpxenc.c
	libavcodec/libvorbis.c
	libavcodec/vmnc.c
	libavformat/asfdec.c
	libavformat/id3v2enc.c
	libavformat/internal.h
	libavformat/mp3enc.c
	libavformat/utils.c
	libavformat/version.h
	libswscale/utils.c
	tests/fate/video.mak
	tests/ref/fate/nuv
	tests/ref/fate/prores-alpha
	tests/ref/lavf/ffm
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

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

9 files changed, 26 insertions, 26 deletions

diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 335ca3d..cd6512c 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -38,13 +38,13 @@ fi
 
 if [ -n "$do_mpeg2_ivlc_qprd" ]; then
 # mpeg2 encoding intra vlc qprd
-do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -trellis 1 -flags +qprd+mv0 -intra_vlc 1 -cmp 2 -subcmp 2 -mbd rd -vcodec mpeg2video -f mpeg2video"
+do_video_encoding mpeg2ivlc-qprd.mpg "-vb 500k -bf 2 -trellis 1 -flags +mv0 -mpv_flags +qp_rd -intra_vlc 1 -cmp 2 -subcmp 2 -mbd rd -vcodec mpeg2video -f mpeg2video"
 do_video_decoding
 fi
 
 if [ -n "$do_mpeg2_422" ]; then
 #mpeg2 4:2:2 encoding
-do_video_encoding mpeg2_422.mpg "-vb 1000k -bf 2 -trellis 1 -flags +qprd+mv0+ildct+ilme -intra_vlc 1 -mbd rd -vcodec mpeg2video -pix_fmt yuv422p -f mpeg2video"
+do_video_encoding mpeg2_422.mpg "-vb 1000k -bf 2 -trellis 1 -flags +mv0+ildct+ilme -mpv_flags +qp_rd -intra_vlc 1 -mbd rd -vcodec mpeg2video -pix_fmt yuv422p -f mpeg2video"
 do_video_decoding
 fi
 
@@ -143,7 +143,7 @@ do_video_decoding
 fi
 
 if [ -n "$do_mpeg4_qprd" ]; then
-do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -trellis 1 -flags +mv4+qprd+mv0 -cmp 2 -subcmp 2 -mbd rd -an -vcodec mpeg4"
+do_video_encoding mpeg4-qprd.avi "-b 450k -bf 2 -trellis 1 -flags +mv4+mv0 -mpv_flags +qp_rd -cmp 2 -subcmp 2 -mbd rd -an -vcodec mpeg4"
 do_video_decoding
 fi
 
diff --git a/tests/fate/cdxl.mak b/tests/fate/cdxl.mak
index 82ac27e..3a46c5c 100644
--- a/tests/fate/cdxl.mak
+++ b/tests/fate/cdxl.mak
@@ -10,5 +10,8 @@ fate-cdxl-pal8: CMD = framecrc -i $(SAMPLES)/cdxl/maku.cdxl -pix_fmt rgb24 -fram
 FATE_CDXL += fate-cdxl-pal8-small
 fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt rgb24 -frames:v 46
 
+FATE_CDXL += fate-cdxl-bitline-ham6
+fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10
+
 FATE_TESTS += $(FATE_CDXL)
 fate-cdxl: $(FATE_CDXL)
diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak
index 9dfa829..4c16cb8 100644
--- a/tests/fate/mp3.mak
+++ b/tests/fate/mp3.mak
@@ -33,6 +33,11 @@ fate-mp3-float-conf-si_block: CMD = pcm -acodec mp3float -i $(SAMPLES)/mp3-confo
 fate-mp3-float-conf-si_block: CMP = stddev
 fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.pcm
 
+FATE_MP3 += fate-mp3-float-extra_overread
+fate-mp3-float-extra_overread: CMD = pcm -c:a mp3float -i $(SAMPLES)/mpegaudio/extra_overread.mp3
+fate-mp3-float-extra_overread: CMP = stddev
+fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.pcm
+
 FATE_TESTS += $(FATE_MP3)
 fate-mp3: $(FATE_MP3)
 $(FATE_MP3): CMP = stddev
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 84a98f6..02aa395 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -143,7 +143,7 @@ FATE_VIDEO += fate-mpeg2-field-enc
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
 
 FATE_VIDEO += fate-nuv
-fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv
+fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an
 
 FATE_VIDEO += fate-qpeg
 fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
diff --git a/tests/ref/fate/cdxl-bitline-ham6 b/tests/ref/fate/cdxl-bitline-ham6
new file mode 100644
index 0000000..8060f06
--- /dev/null
+++ b/tests/ref/fate/cdxl-bitline-ham6
@@ -0,0 +1,11 @@
+#tb 0: 12/601
+0,          0,          0,        1,    63180, 0xcda82c16
+0,          1,          1,        1,    63180, 0xa6097bf9
+0,          2,          2,        1,    63180, 0x4c2fb091
+0,          3,          3,        1,    63180, 0xc597db00
+0,          4,          4,        1,    63180, 0xfa581ccd
+0,          5,          5,        1,    63180, 0x3e51498f
+0,          6,          6,        1,    63180, 0xe3495396
+0,          7,          7,        1,    63180, 0x425f5f02
+0,          8,          8,        1,    63180, 0x6077465f
+0,          9,          9,        1,    63180, 0x923ba29c
diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv
index 0cc9001..8838fbb 100644
--- a/tests/ref/fate/nuv
+++ b/tests/ref/fate/nuv
@@ -1,29 +1,10 @@
 #tb 0: 100/2997
-#tb 1: 1/44100
-1,          0,          0,     1024,     4096, 0x00000000
-1,       1024,       1024,     1024,     4096, 0x4dfae7a6
-1,       2048,       2048,     1024,     4096, 0x3fd9f5c6
-1,       3072,       3072,     1024,     4096, 0x7b86e310
-1,       4096,       4096,     1024,     4096, 0x611cece5
-1,       5120,       5120,     1024,     4096, 0xb7d8e872
 0,          4,          4,        1,   460800, 0x54aedafe
-1,       6144,       6144,     1024,     4096, 0x072ef72b
-1,       7168,       7168,     1024,     4096, 0xb3560144
 0,          5,          5,        1,   460800, 0xb7aa8b56
-1,       8192,       8192,     1024,     4096, 0x0a3d119e
 0,          6,          6,        1,   460800, 0x283ea3b5
-1,       9216,       9216,     1024,     4096, 0xbe391aa4
-1,      10240,      10240,     1024,     4096, 0x28f7c6e5
 0,          7,          7,        1,   460800, 0x283ea3b5
-1,      11264,      11264,     1024,     4096, 0xca9d9df2
 0,          8,          8,        1,   460800, 0x10e577de
-1,      12288,      12288,     1024,     4096, 0x5c6b95a9
 0,          9,          9,        1,   460800, 0x4e091ee2
-1,      13312,      13312,     1024,     4096, 0x0bdfc0bf
-1,      14336,      14336,     1024,     4096, 0xd95a9277
 0,         10,         10,        1,   460800, 0x2ea88828
-1,      15360,      15360,     1024,     4096, 0xae2bef2c
 0,         11,         11,        1,   460800, 0x4b7f4df0
-1,      16384,      16384,     1024,     4096, 0xbf031e83
-1,      17408,      17408,     1024,     4096, 0x4c83e2d1
 0,         12,         12,        1,   460800, 0xa57f20d0
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
index 73e94dd..4767b99 100644
--- a/tests/ref/lavf/ffm
+++ b/tests/ref/lavf/ffm
@@ -1,3 +1,3 @@
-4ef091d638bb20b8eaef5b3a0d6f97b7 *./tests/data/lavf/lavf.ffm
+8ce2ea9a73a1187647df7bf3c8e1b8fd *./tests/data/lavf/lavf.ffm
 376832 ./tests/data/lavf/lavf.ffm
 ./tests/data/lavf/lavf.ffm CRC=0xf361ed74
diff --git a/tests/ref/vsynth1/prores_kostya b/tests/ref/vsynth1/prores_kostya
index 870e284..032cda2 100644
--- a/tests/ref/vsynth1/prores_kostya
+++ b/tests/ref/vsynth1/prores_kostya
@@ -1,4 +1,4 @@
-40e7637e04991dbe9a23fe109f95bfc8 *./tests/data/vsynth1/prores_kostya.mov
+f8fe98b7f9bb66857c81dbca409a9037 *./tests/data/vsynth1/prores_kostya.mov
 3858901 ./tests/data/vsynth1/prores_kostya.mov
 0a4153637d0cc0a88a8bcbf04cfaf8c6 *./tests/data/prores_kostya.vsynth1.out.yuv
 stddev:    3.17 PSNR: 38.09 MAXDIFF:   39 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth2/prores_kostya b/tests/ref/vsynth2/prores_kostya
index 2b99c75..efdcd8f 100644
--- a/tests/ref/vsynth2/prores_kostya
+++ b/tests/ref/vsynth2/prores_kostya
@@ -1,4 +1,4 @@
-ed8b8a94da049518af8f95c5da736e57 *./tests/data/vsynth2/prores_kostya.mov
+26adb18726c08dde23bc4bee2eb591e2 *./tests/data/vsynth2/prores_kostya.mov
 3884586 ./tests/data/vsynth2/prores_kostya.mov
 ca2f6c1162635dedfa468c90f1fdc0ef *./tests/data/prores_kostya.vsynth2.out.yuv
 stddev:    0.92 PSNR: 48.77 MAXDIFF:   10 bytes:  7603200/  7603200