Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  rtpenc: Add support for G726 audio
  rtpdec: Interpret the different G726 names as bits_per_coded_sample
  rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
  rtpenc: Cast a rescaling parameter to int64_t
  h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
  ARM: fix indentation in ff_dsputil_init_neon()
  ARM: NEON put/avg_pixels8/16 cosmetics
  ARM: add remaining NEON avg_pixels8/16 functions
  ARM: clean up NEON put/avg_pixels macros
  fate: split acodec-pcm into individual tests
  swscale: #include "libavutil/mathematics.h"
  pmpdec: don't use deprecated av_set_pts_info.
  rv34: align temporary block of "dct" coefs
  Add PlayStation Portable PMP format demuxer
  proto: Realign struct initializers
  proto: Use .priv_data_size to allocate the private context
  mmsh: Properly clean up if the second ffurl_alloc failed
  rtmp: Clean up properly if the handshake failed
  md5proto: Remove the get_file_handle function
  applehttpproto: Use the close function if the open function fails
  ...

Conflicts:
	libavcodec/vble.c
	libavformat/mmsh.c
	libavformat/pmpdec.c
	libavformat/udp.c
	tests/ref/acodec/pcm

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

19 files changed, 103 insertions, 181 deletions

diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh
index 12f74f055d..7a71e47273 100755
--- a/tests/codec-regression.sh
+++ b/tests/codec-regression.sh
@@ -395,26 +395,62 @@ do_audio_enc_dec() {
     do_audio_decoding
 }
 
-if [ -n "$do_pcm" ] ; then
+if [ -n "$do_pcm_alaw" ] ; then
 do_audio_enc_dec wav s16 pcm_alaw
+fi
+if [ -n "$do_pcm_mulaw" ] ; then
 do_audio_enc_dec wav s16 pcm_mulaw
+fi
+if [ -n "$do_pcm_s8" ] ; then
 do_audio_enc_dec mov u8 pcm_s8
+fi
+if [ -n "$do_pcm_u8" ] ; then
 do_audio_enc_dec wav u8 pcm_u8
+fi
+if [ -n "$do_pcm_s16be" ] ; then
 do_audio_enc_dec mov s16 pcm_s16be
+fi
+if [ -n "$do_pcm_s16le" ] ; then
 do_audio_enc_dec wav s16 pcm_s16le
-do_audio_enc_dec mkv s16 pcm_s16be
-do_audio_enc_dec mkv s16 pcm_s16le
+fi
+if [ -n "$do_pcm_s24be" ] ; then
 do_audio_enc_dec mov s32 pcm_s24be
+fi
+if [ -n "$do_pcm_s24le" ] ; then
 do_audio_enc_dec wav s32 pcm_s24le
-#do_audio_enc_dec ??? s32 pcm_u24be #no compatible muxer or demuxer
-#do_audio_enc_dec ??? s32 pcm_u24le #no compatible muxer or demuxer
+fi
+# no compatible muxer or demuxer
+# if [ -n "$do_pcm_u24be" ] ; then
+# do_audio_enc_dec ??? u32 pcm_u24be
+# fi
+# if [ -n "$do_pcm_u24le" ] ; then
+# do_audio_enc_dec ??? u32 pcm_u24le
+# fi
+if [ -n "$do_pcm_s32be" ] ; then
 do_audio_enc_dec mov s32 pcm_s32be
+fi
+if [ -n "$do_pcm_s32le" ] ; then
 do_audio_enc_dec wav s32 pcm_s32le
-#do_audio_enc_dec ??? s32 pcm_u32be #no compatible muxer or demuxer
-#do_audio_enc_dec ??? s32 pcm_u32le #no compatible muxer or demuxer
+fi
+# no compatible muxer or demuxer
+# if [ -n "$do_pcm_u32be" ] ; then
+# do_audio_enc_dec ??? u32 pcm_u32be
+# fi
+# if [ -n "$do_pcm_u32le" ] ; then
+# do_audio_enc_dec ??? u32 pcm_u32le
+# fi
+if [ -n "$do_pcm_f32be" ] ; then
 do_audio_enc_dec au  flt pcm_f32be
+fi
+if [ -n "$do_pcm_f32le" ] ; then
 do_audio_enc_dec wav flt pcm_f32le
+fi
+if [ -n "$do_pcm_f64be" ] ; then
 do_audio_enc_dec au  dbl pcm_f64be
+fi
+if [ -n "$do_pcm_f64le" ] ; then
 do_audio_enc_dec wav dbl pcm_f64le
+fi
+if [ -n "$do_pcm_s24daud" ] ; then
 do_audio_enc_dec 302 s16 pcm_s24daud "-ac 6 -ar 96000"
 fi
diff --git a/tests/ref/acodec/pcm b/tests/ref/acodec/pcm
deleted file mode 100644
index e338f2a1bf..0000000000
--- a/tests/ref/acodec/pcm
+++ /dev/null
@@ -1,68 +0,0 @@
-ede2da07839a00c255a43129922f2c7b *./tests/data/acodec/pcm_alaw.wav
-529258 ./tests/data/acodec/pcm_alaw.wav
-f323f7551ffad91de8613f44dcb198b6 *./tests/data/pcm.acodec.out.wav
-stddev:  101.67 PSNR: 56.19 MAXDIFF:  515 bytes:  1058400/  1058400
-0c2a55850fb46ad5385a69b15b271f10 *./tests/data/acodec/pcm_mulaw.wav
-529258 ./tests/data/acodec/pcm_mulaw.wav
-7ae8c3fc804bd574006fd547fe28980c *./tests/data/pcm.acodec.out.wav
-stddev:  103.38 PSNR: 56.04 MAXDIFF:  644 bytes:  1058400/  1058400
-b78d2a30df75af08ecf86f201281fec2 *./tests/data/acodec/pcm_s8.mov
-529793 ./tests/data/acodec/pcm_s8.mov
-651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm.acodec.out.wav
-stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
-70fecbae732f81143a560c7315eda49a *./tests/data/acodec/pcm_u8.wav
-529246 ./tests/data/acodec/pcm_u8.wav
-651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm.acodec.out.wav
-stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
-9686b93d1439fc2df991a004ab0298f4 *./tests/data/acodec/pcm_s16be.mov
-1058993 ./tests/data/acodec/pcm_s16be.mov
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec/pcm_s16le.wav
-1058446 ./tests/data/acodec/pcm_s16le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-af717ca95eaca310772eb1238c745d1b *./tests/data/acodec/pcm_s16be.mkv
-1060638 ./tests/data/acodec/pcm_s16be.mkv
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-c4f51bf32fad2f7af8ea5beedb56168b *./tests/data/acodec/pcm_s16le.mkv
-1060638 ./tests/data/acodec/pcm_s16le.mkv
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-22c5c3df0a4765e28c205a4fb95b3cdc *./tests/data/acodec/pcm_s24be.mov
-1588193 ./tests/data/acodec/pcm_s24be.mov
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/acodec/pcm_s24le.wav
-1587668 ./tests/data/acodec/pcm_s24le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-b36ac7a1b4fc28248a565a676e555bd1 *./tests/data/acodec/pcm_s32be.mov
-2117393 ./tests/data/acodec/pcm_s32be.mov
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-da6ed80f4f40f0082577dea80827e014 *./tests/data/acodec/pcm_s32le.wav
-2116868 ./tests/data/acodec/pcm_s32le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/acodec/pcm_f32be.au
-2116824 ./tests/data/acodec/pcm_f32be.au
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-46f44f86a18984a832206ab9e29a79f2 *./tests/data/acodec/pcm_f32le.wav
-2116880 ./tests/data/acodec/pcm_f32le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-8112296b1ed94f72f20d04b1a54850a7 *./tests/data/acodec/pcm_f64be.au
-4233624 ./tests/data/acodec/pcm_f64be.au
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/acodec/pcm_f64le.wav
-4233680 ./tests/data/acodec/pcm_f64le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm.acodec.out.wav
-stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
-1b75d5198ae789ab3c48f7024e08f4a9 *./tests/data/acodec/pcm_s24daud.302
-10368730 ./tests/data/acodec/pcm_s24daud.302
-4708f86529c594e29404603c64bb208c *./tests/data/pcm.acodec.out.wav
-stddev: 8967.92 PSNR: 17.28 MAXDIFF:42548 bytes:  6911796/  1058400
diff --git a/tests/ref/acodec/pcm_alaw b/tests/ref/acodec/pcm_alaw
new file mode 100644
index 0000000000..4943831d39
--- /dev/null
+++ b/tests/ref/acodec/pcm_alaw
@@ -0,0 +1,4 @@
+ede2da07839a00c255a43129922f2c7b *./tests/data/acodec/pcm_alaw.wav
+529258 ./tests/data/acodec/pcm_alaw.wav
+f323f7551ffad91de8613f44dcb198b6 *./tests/data/pcm_alaw.acodec.out.wav
+stddev:  101.67 PSNR: 56.19 MAXDIFF:  515 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_f32be b/tests/ref/acodec/pcm_f32be
new file mode 100644
index 0000000000..5f067c2dfb
--- /dev/null
+++ b/tests/ref/acodec/pcm_f32be
@@ -0,0 +1,4 @@
+118ff3dc83c62ce9ce669eef57e55bb2 *./tests/data/acodec/pcm_f32be.au
+2116824 ./tests/data/acodec/pcm_f32be.au
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_f32be.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_f32le b/tests/ref/acodec/pcm_f32le
new file mode 100644
index 0000000000..38e5c0b719
--- /dev/null
+++ b/tests/ref/acodec/pcm_f32le
@@ -0,0 +1,4 @@
+46f44f86a18984a832206ab9e29a79f2 *./tests/data/acodec/pcm_f32le.wav
+2116880 ./tests/data/acodec/pcm_f32le.wav
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_f32le.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_f64be b/tests/ref/acodec/pcm_f64be
new file mode 100644
index 0000000000..9abdabc747
--- /dev/null
+++ b/tests/ref/acodec/pcm_f64be
@@ -0,0 +1,4 @@
+8112296b1ed94f72f20d04b1a54850a7 *./tests/data/acodec/pcm_f64be.au
+4233624 ./tests/data/acodec/pcm_f64be.au
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_f64be.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_f64le b/tests/ref/acodec/pcm_f64le
new file mode 100644
index 0000000000..42875a8d2f
--- /dev/null
+++ b/tests/ref/acodec/pcm_f64le
@@ -0,0 +1,4 @@
+ba17c6d1a270e1333e981f239bf7eb45 *./tests/data/acodec/pcm_f64le.wav
+4233680 ./tests/data/acodec/pcm_f64le.wav
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_f64le.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_mulaw b/tests/ref/acodec/pcm_mulaw
new file mode 100644
index 0000000000..cefd76ba49
--- /dev/null
+++ b/tests/ref/acodec/pcm_mulaw
@@ -0,0 +1,4 @@
+0c2a55850fb46ad5385a69b15b271f10 *./tests/data/acodec/pcm_mulaw.wav
+529258 ./tests/data/acodec/pcm_mulaw.wav
+7ae8c3fc804bd574006fd547fe28980c *./tests/data/pcm_mulaw.acodec.out.wav
+stddev:  103.38 PSNR: 56.04 MAXDIFF:  644 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s16be b/tests/ref/acodec/pcm_s16be
new file mode 100644
index 0000000000..53c4b43704
--- /dev/null
+++ b/tests/ref/acodec/pcm_s16be
@@ -0,0 +1,4 @@
+9686b93d1439fc2df991a004ab0298f4 *./tests/data/acodec/pcm_s16be.mov
+1058993 ./tests/data/acodec/pcm_s16be.mov
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s16be.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s16le b/tests/ref/acodec/pcm_s16le
new file mode 100644
index 0000000000..c7b5de7b92
--- /dev/null
+++ b/tests/ref/acodec/pcm_s16le
@@ -0,0 +1,4 @@
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec/pcm_s16le.wav
+1058446 ./tests/data/acodec/pcm_s16le.wav
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s16le.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s24be b/tests/ref/acodec/pcm_s24be
new file mode 100644
index 0000000000..743183e337
--- /dev/null
+++ b/tests/ref/acodec/pcm_s24be
@@ -0,0 +1,4 @@
+22c5c3df0a4765e28c205a4fb95b3cdc *./tests/data/acodec/pcm_s24be.mov
+1588193 ./tests/data/acodec/pcm_s24be.mov
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24be.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s24daud b/tests/ref/acodec/pcm_s24daud
new file mode 100644
index 0000000000..62c4421908
--- /dev/null
+++ b/tests/ref/acodec/pcm_s24daud
@@ -0,0 +1,4 @@
+1b75d5198ae789ab3c48f7024e08f4a9 *./tests/data/acodec/pcm_s24daud.302
+10368730 ./tests/data/acodec/pcm_s24daud.302
+4708f86529c594e29404603c64bb208c *./tests/data/pcm_s24daud.acodec.out.wav
+stddev: 8967.92 PSNR: 17.28 MAXDIFF:42548 bytes:  6911796/  1058400
diff --git a/tests/ref/acodec/pcm_s24le b/tests/ref/acodec/pcm_s24le
new file mode 100644
index 0000000000..a724e8c189
--- /dev/null
+++ b/tests/ref/acodec/pcm_s24le
@@ -0,0 +1,4 @@
+a85380fb79b0d4fff38e24ac1e34bb94 *./tests/data/acodec/pcm_s24le.wav
+1587668 ./tests/data/acodec/pcm_s24le.wav
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s24le.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s32be b/tests/ref/acodec/pcm_s32be
new file mode 100644
index 0000000000..e2fbd3ba5a
--- /dev/null
+++ b/tests/ref/acodec/pcm_s32be
@@ -0,0 +1,4 @@
+b36ac7a1b4fc28248a565a676e555bd1 *./tests/data/acodec/pcm_s32be.mov
+2117393 ./tests/data/acodec/pcm_s32be.mov
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s32be.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s32le b/tests/ref/acodec/pcm_s32le
new file mode 100644
index 0000000000..86777505f5
--- /dev/null
+++ b/tests/ref/acodec/pcm_s32le
@@ -0,0 +1,4 @@
+da6ed80f4f40f0082577dea80827e014 *./tests/data/acodec/pcm_s32le.wav
+2116868 ./tests/data/acodec/pcm_s32le.wav
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/pcm_s32le.acodec.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_s8 b/tests/ref/acodec/pcm_s8
new file mode 100644
index 0000000000..34e5149f78
--- /dev/null
+++ b/tests/ref/acodec/pcm_s8
@@ -0,0 +1,4 @@
+b78d2a30df75af08ecf86f201281fec2 *./tests/data/acodec/pcm_s8.mov
+529793 ./tests/data/acodec/pcm_s8.mov
+651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm_s8.acodec.out.wav
+stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm_u8 b/tests/ref/acodec/pcm_u8
new file mode 100644
index 0000000000..e8d70c93e9
--- /dev/null
+++ b/tests/ref/acodec/pcm_u8
@@ -0,0 +1,4 @@
+70fecbae732f81143a560c7315eda49a *./tests/data/acodec/pcm_u8.wav
+529246 ./tests/data/acodec/pcm_u8.wav
+651d4eb8d98dfcdda96ae6c43d8f156b *./tests/data/pcm_u8.acodec.out.wav
+stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
diff --git a/tests/ref/seek/pcm_s16be_mkv b/tests/ref/seek/pcm_s16be_mkv
deleted file mode 100644
index 8889c423b7..0000000000
--- a/tests/ref/seek/pcm_s16be_mkv
+++ /dev/null
@@ -1,53 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.881000 pts: 1.881000 pos: 332755 size:  4096
-ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.789000 pts: 0.789000 pos: 139914 size:  4096
-ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.577000 pts: 2.577000 pos: 455845 size:  4096
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.463000 pts: 1.463000 pos: 258901 size:  4096
-ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:  66060 size:  4096
-ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.159000 pts: 2.159000 pos: 381991 size:  4096
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.045000 pts: 1.045000 pos: 185047 size:  4096
-ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 2.833000 pts: 2.833000 pos: 500978 size:  4096
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.741000 pts: 1.741000 pos: 308137 size:  4096
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.604000 pts: 0.604000 pos: 107090 size:  4096
-ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 2.392000 pts: 2.392000 pos: 423021 size:  4096
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.324000 pts: 1.324000 pos: 234283 size:  4096
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:  33236 size:  4096
-ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.974000 pts: 1.974000 pos: 349167 size:  4096
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.906000 pts: 0.906000 pos: 160429 size:  4096
-ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 2.694000 pts: 2.694000 pos: 476360 size:  4096
-ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.556000 pts: 1.556000 pos: 275313 size:  4096
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.464000 pts: 0.464000 pos:  82472 size:  4096
-ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
diff --git a/tests/ref/seek/pcm_s16le_mkv b/tests/ref/seek/pcm_s16le_mkv
deleted file mode 100644
index 8889c423b7..0000000000
--- a/tests/ref/seek/pcm_s16le_mkv
+++ /dev/null
@@ -1,53 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.881000 pts: 1.881000 pos: 332755 size:  4096
-ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.789000 pts: 0.789000 pos: 139914 size:  4096
-ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.577000 pts: 2.577000 pos: 455845 size:  4096
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.463000 pts: 1.463000 pos: 258901 size:  4096
-ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:  66060 size:  4096
-ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.159000 pts: 2.159000 pos: 381991 size:  4096
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.045000 pts: 1.045000 pos: 185047 size:  4096
-ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 2.833000 pts: 2.833000 pos: 500978 size:  4096
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.741000 pts: 1.741000 pos: 308137 size:  4096
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.604000 pts: 0.604000 pos: 107090 size:  4096
-ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 2.392000 pts: 2.392000 pos: 423021 size:  4096
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.324000 pts: 1.324000 pos: 234283 size:  4096
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:  33236 size:  4096
-ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.974000 pts: 1.974000 pos: 349167 size:  4096
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.906000 pts: 0.906000 pos: 160429 size:  4096
-ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096
-ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 2.694000 pts: 2.694000 pos: 476360 size:  4096
-ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.556000 pts: 1.556000 pos: 275313 size:  4096
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.464000 pts: 0.464000 pos:  82472 size:  4096
-ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    412 size:  4096