Merge remote-tracking branch 'qatar/master'

* qatar/master: (26 commits)
  adxenc: use AVCodec.encode2()
  adxenc: Use the AVFrame in ADXContext for coded_frame
  indeo4: fix out-of-bounds function call.
  configure: Restructure help output.
  configure: Internal-only components should not be command-line selectable.
  vorbisenc: use AVCodec.encode2()
  libvorbis: use AVCodec.encode2()
  libopencore-amrnbenc: use AVCodec.encode2()
  ra144enc: use AVCodec.encode2()
  nellymoserenc: use AVCodec.encode2()
  roqaudioenc: use AVCodec.encode2()
  libspeex: use AVCodec.encode2()
  libvo_amrwbenc: use AVCodec.encode2()
  libvo_aacenc: use AVCodec.encode2()
  wmaenc: use AVCodec.encode2()
  mpegaudioenc: use AVCodec.encode2()
  libmp3lame: use AVCodec.encode2()
  libgsmenc: use AVCodec.encode2()
  libfaac: use AVCodec.encode2()
  g726enc: use AVCodec.encode2()
  ...

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/ac3enc.c
	libavcodec/adxenc.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/vorbisenc.c
	libavcodec/wmaenc.c
	tests/ref/acodec/g722
	tests/ref/lavf/asf
	tests/ref/lavf/ffm
	tests/ref/lavf/mkv
	tests/ref/lavf/mpg
	tests/ref/lavf/rm
	tests/ref/lavf/ts
	tests/ref/seek/lavf_asf
	tests/ref/seek/lavf_ffm
	tests/ref/seek/lavf_mkv
	tests/ref/seek/lavf_mpg
	tests/ref/seek/lavf_rm
	tests/ref/seek/lavf_ts

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

diff --cc configure
index c6a4d17107943eb65d81535253b326e8c6ddf8a4,34a5f12ab2dd6650391e0f07ea6461dc2a0eb228..b80550f67a4d35e596816ed1b0e47af500a9a193
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -79,11 -90,21 +90,21 @@@ Licensing options
    --enable-version3        upgrade (L)GPL to version 3 [no]
    --enable-nonfree         allow use of nonfree code, the resulting libs
                             and binaries will be unredistributable [no]
+ 
+ Configuration options:
+   --disable-static         do not build static libraries [no]
+   --enable-shared          build shared libraries [no]
+   --enable-small           optimize for size instead of speed
+   --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary)
+   --enable-gray            enable full grayscale support (slower color)
+   --disable-swscale-alpha  disable alpha channel support in swscale
+ 
+ Component options:
    --disable-doc            do not build documentation
 -  --disable-avconv         disable avconv build
 -  --disable-avplay         disable avplay build
 -  --disable-avprobe        disable avprobe build
 -  --disable-avserver       disable avserver build
 +  --disable-ffmpeg         disable ffmpeg build
 +  --disable-ffplay         disable ffplay build
 +  --disable-ffprobe        disable ffprobe build
 +  --disable-ffserver       disable ffserver build
    --disable-avdevice       disable libavdevice build
    --disable-avcodec        disable libavcodec build
    --disable-avformat       disable libavformat build
@@@ -93,32 -112,19 +114,20 @@@
    --disable-avfilter       disable video filter support [no]
    --disable-pthreads       disable pthreads [auto]
    --disable-w32threads     disable Win32 threads [auto]
 +  --disable-os2threads     disable OS/2 threads [auto]
    --enable-x11grab         enable X11 grabbing [no]
    --disable-network        disable network support [no]
-   --enable-gray            enable full grayscale support (slower color)
-   --disable-swscale-alpha  disable alpha channel support in swscale
-   --disable-fastdiv        disable table-based division
-   --enable-small           optimize for size instead of speed
-   --disable-aandct         disable AAN DCT code
    --disable-dct            disable DCT code
    --disable-fft            disable FFT code
-   --disable-golomb         disable Golomb code
-   --disable-huffman        disable Huffman code
-   --disable-lpc            disable LPC code
    --disable-mdct           disable MDCT code
    --disable-rdft           disable RDFT code
 -  --enable-vaapi           enable VAAPI code
 -  --enable-vda             enable VDA code
 -  --enable-vdpau           enable VDPAU code
+   --disable-fft            disable FFT code
+   --enable-dxva2           enable DXVA2 code
-   --enable-vda             enable VDA code [autodetect]
 +  --enable-vaapi           enable VAAPI code [autodetect]
-   --disable-dxva2          disable DXVA2 code
-   --disable-vda            disable VDA code
-   --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary)
-   --enable-hardcoded-tables use hardcoded tables instead of runtime generation
-   --disable-safe-bitstream-reader
-                            disable buffer boundary checking in bitreaders
-                            (faster, but may crash)
-   --enable-memalign-hack   emulate memalign, interferes with memory debuggers
++  --enable-vda             enable VDA code   [autodetect]
 +  --enable-vdpau           enable VDPAU code [autodetect]
+ 
+ Individual component options:
    --disable-everything     disable all components listed below
    --disable-encoder=NAME   disable encoder NAME
    --enable-encoder=NAME    enable encoder NAME
@@@ -233,8 -218,9 +233,10 @@@ Advanced options (experts only)
    --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
    --extra-libs=ELIBS       add ELIBS [$ELIBS]
    --extra-version=STRING   version string suffix []
+   --optflags               override optimization-related compiler flags
    --build-suffix=SUFFIX    library name suffix []
+   --malloc-prefix=PREFIX   prefix malloc and related names with PREFIX
 +  --progs-suffix=SUFFIX    program name suffix []
    --arch=ARCH              select architecture [$arch]
    --cpu=CPU                select the minimum required CPU (affects
                             instruction selection, may crash on older CPUs)
@@@ -255,16 -252,8 +268,11 @@@ Optimization options (experts only)
    --disable-neon           disable NEON optimizations
    --disable-vis            disable VIS optimizations
    --disable-yasm           disable use of yasm assembler
-   --enable-pic             build position-independent code
-   --malloc-prefix=PFX      prefix malloc and related names with PFX
-   --enable-sram            allow use of on-chip SRAM
-   --disable-symver         disable symbol versioning
-   --optflags               override optimization-related compiler flags
 +  --postproc-version=V     build libpostproc version V.
 +                           Where V can be '$ALT_PP_VER_MAJOR.$ALT_PP_VER_MINOR.$ALT_PP_VER_MICRO' or 'current'. [$postproc_version_default]
  
 -Developer options (useful when working on Libav itself):
 +Developer options (useful when working on FFmpeg itself):
 +  --enable-coverage        build with test coverage instrumentation
    --disable-debug          disable debugging symbols
    --enable-debug=LEVEL     set the debug level [$debuglevel]
    --disable-optimizations  disable compiler optimizations
@@@ -1019,19 -939,10 +1023,14 @@@ CONFIG_LIST=
      fft
      frei0r
      gnutls
-     golomb
      gpl
      gray
-     h264chroma
-     h264dsp
-     h264pred
      hardcoded_tables
-     huffman
 +    libaacplus
 +    libass
 +    libbluray
      libcdio
 +    libcelt
      libdc1394
      libdirac
      libfaac

diff --cc libavcodec/Makefile
index 92e68fad86e579e0da4154dfe37bbae6e0eb249d,23270544e9fa92d7a99f469bd52847df24d8d2e6..ec29ce5ef1e9207cc5e179aaf4595b91deebe2d5
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -349,11 -320,10 +351,12 @@@ OBJS-$(CONFIG_QPEG_DECODER)            
  OBJS-$(CONFIG_QTRLE_DECODER)           += qtrle.o
  OBJS-$(CONFIG_QTRLE_ENCODER)           += qtrleenc.o
  OBJS-$(CONFIG_R10K_DECODER)            += r210dec.o
 +OBJS-$(CONFIG_R10K_ENCODER)            += r210enc.o
  OBJS-$(CONFIG_R210_DECODER)            += r210dec.o
 +OBJS-$(CONFIG_R210_ENCODER)            += r210enc.o
  OBJS-$(CONFIG_RA_144_DECODER)          += ra144dec.o ra144.o celp_filters.o
- OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o celp_filters.o
+ OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o celp_filters.o \
+                                           audio_frame_queue.o
  OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o celp_math.o celp_filters.o
  OBJS-$(CONFIG_RALF_DECODER)            += ralf.o
  OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.o
@@@ -627,10 -582,8 +630,10 @@@ OBJS-$(CONFIG_WEBM_MUXER)              
  OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
  
  # external codec libraries
 +OBJS-$(CONFIG_LIBAACPLUS_ENCODER)         += libaacplus.o
 +OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
  OBJS-$(CONFIG_LIBDIRAC_DECODER)           += libdiracdec.o
- OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
+ OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o audio_frame_queue.o
  OBJS-$(CONFIG_LIBGSM_DECODER)             += libgsm.o
  OBJS-$(CONFIG_LIBGSM_ENCODER)             += libgsm.o
  OBJS-$(CONFIG_LIBGSM_MS_DECODER)          += libgsm.o
@@@ -648,14 -601,12 +652,15 @@@ OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER
                                               libschroedinger.o    \
                                               libdirac_libschro.o
  OBJS-$(CONFIG_LIBSPEEX_DECODER)           += libspeexdec.o
- OBJS-$(CONFIG_LIBSPEEX_ENCODER)           += libspeexenc.o
+ OBJS-$(CONFIG_LIBSPEEX_ENCODER)           += libspeexenc.o audio_frame_queue.o
 +OBJS-$(CONFIG_LIBSTAGEFRIGHT_H264_DECODER)+= libstagefright.o
  OBJS-$(CONFIG_LIBTHEORA_ENCODER)          += libtheoraenc.o
 +OBJS-$(CONFIG_LIBUTVIDEO_DECODER)         += libutvideodec.o
 +OBJS-$(CONFIG_LIBUTVIDEO_ENCODER)         += libutvideoenc.o
  OBJS-$(CONFIG_LIBVO_AACENC_ENCODER)       += libvo-aacenc.o mpeg4audio.o
  OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER)     += libvo-amrwbenc.o
- OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o vorbis_data.o
+ OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o audio_frame_queue.o \
+                                              vorbis_data.o vorbis_parser.o
  OBJS-$(CONFIG_LIBVPX_DECODER)             += libvpxdec.o
  OBJS-$(CONFIG_LIBVPX_ENCODER)             += libvpxenc.o
  OBJS-$(CONFIG_LIBX264_ENCODER)            += libx264.o

diff --cc libavcodec/aacenc.c
index 14be58f885da161d838c2e790cf5e5dfefdab274,952b6149f1d4832b126d75df508cd8bfa2a7b9ef..0ad0730816f4da9378130467a7e79b3f660ec319
--- 1/libavcodec/aacenc.c
--- 2/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@@ -474,10 -475,9 +475,9 @@@ static void put_bitstream_info(AVCodecC
  
  /*
   * Deinterleave input samples.
 - * Channels are reordered from Libav's default order to AAC order.
 + * Channels are reordered from libavcodec's default order to AAC order.
   */
- static void deinterleave_input_samples(AACEncContext *s,
-                                        const float *samples, int nb_samples)
+ static void deinterleave_input_samples(AACEncContext *s, AVFrame *frame)
  {
      int ch, i;
      const int sinc = s->channels;

diff --cc libavcodec/aacenc.h
index d87cc0479ba70886703abf4e8ffbec9b32efcb4a,f4e531a9a610d2866b31b33839d506df4c227bee..35a2565ef41394a63198e6a4ad74ca60bfd1c596
--- 1/libavcodec/aacenc.h
--- 2/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@@ -27,14 -27,11 +27,14 @@@
  #include "dsputil.h"
  
  #include "aac.h"
- 
+ #include "audio_frame_queue.h"
  #include "psymodel.h"
  
 +#define AAC_CODER_NB 4
 +
  typedef struct AACEncOptions {
      int stereo_mode;
 +    int aac_coder;
  } AACEncOptions;
  
  struct AACEncContext;

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/ac3enc_fixed.c
Simple merge

diff --cc libavcodec/ac3enc_float.c
Simple merge

diff --cc libavcodec/ac3enc_template.c
Simple merge

diff --cc libavcodec/adpcmenc.c
Simple merge

diff --cc libavcodec/adxenc.c
index c6e46565f6caec0eabb5f3a638f9d3d219e7b66e,0b5ca2e2dc266f0470a792aaa9abf21e5e65fbcd..5ab53dd1ea888c332a7c47d843b460995d595516
--- 1/libavcodec/adxenc.c
--- 2/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@@ -119,9 -117,10 +117,11 @@@ static av_cold int adx_encode_init(AVCo
      }
      avctx->frame_size = BLOCK_SAMPLES;
  
 -    avcodec_get_frame_defaults(&c->frame);
 -    avctx->coded_frame = &c->frame;
+ #if FF_API_OLD_ENCODE_AUDIO
 +    avctx->coded_frame = avcodec_alloc_frame();
 +    if (!avctx->coded_frame)
 +        return AVERROR(ENOMEM);
+ #endif
  
      /* the cutoff can be adjusted, but this seems to work pretty well */
      c->cutoff = 500;

diff --cc libavcodec/flacenc.c
index ecf883e652de5fde8a694209c5c5199beffa0f1c,7fd4075c71eec8856d9c2cfc7365cb39a0b922c5..e8d6e8cb2199f30ee5e9a2e741b63a06ccb3fce3
--- 1/libavcodec/flacenc.c
--- 2/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@@ -370,29 -372,8 +372,30 @@@ static av_cold int flac_encode_init(AVC
      avctx->coded_frame = avcodec_alloc_frame();
      if (!avctx->coded_frame)
          return AVERROR(ENOMEM);
+ #endif
  
 +    if (channels == 3 &&
 +            avctx->channel_layout != (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER) ||
 +        channels == 4 &&
 +            avctx->channel_layout != AV_CH_LAYOUT_2_2 &&
 +            avctx->channel_layout != AV_CH_LAYOUT_QUAD ||
 +        channels == 5 &&
 +            avctx->channel_layout != AV_CH_LAYOUT_5POINT0 &&
 +            avctx->channel_layout != AV_CH_LAYOUT_5POINT0_BACK ||
 +        channels == 6 &&
 +            avctx->channel_layout != AV_CH_LAYOUT_5POINT1 &&
 +            avctx->channel_layout != AV_CH_LAYOUT_5POINT1_BACK) {
 +        if (avctx->channel_layout) {
 +            av_log(avctx, AV_LOG_ERROR, "Channel layout not supported by Flac, "
 +                                             "output stream will have incorrect "
 +                                             "channel layout.\n");
 +        } else {
 +            av_log(avctx, AV_LOG_WARNING, "No channel layout specified. The encoder "
 +                                               "will use Flac channel layout for "
 +                                               "%d channels.\n", channels);
 +        }
 +    }
 +
      ret = ff_lpc_init(&s->lpc_ctx, avctx->frame_size,
                        s->options.max_prediction_order, FF_LPC_TYPE_LEVINSON);
  
@@@ -1316,9 -1304,9 +1326,9 @@@ AVCodec ff_flac_encoder = 
      .id             = CODEC_ID_FLAC,
      .priv_data_size = sizeof(FlacEncodeContext),
      .init           = flac_encode_init,
-     .encode         = flac_encode_frame,
+     .encode2        = flac_encode_frame,
      .close          = flac_encode_close,
 -    .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
 +    .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | CODEC_CAP_LOSSLESS,
      .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
      .long_name = NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
      .priv_class = &flac_encoder_class,

diff --cc libavcodec/g726.c
Simple merge

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc libavcodec/libfaac.c
index 4fa570e15567357748e0e1832dfce3a1d4b7260e,6a74465e9d73af326479eb0e06dbb7544e615672..ab442add4a79c9d41c88f279de6693e621292c7b
--- 1/libavcodec/libfaac.c
--- 2/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@@ -24,19 -24,21 +24,27 @@@
   * Interface to libfaac for aac encoding.
   */
  
- #include "avcodec.h"
  #include <faac.h>
  
+ #include "avcodec.h"
+ #include "audio_frame_queue.h"
+ #include "internal.h"
+ 
+ 
+ /* libfaac has an encoder delay of 1024 samples */
+ #define FAAC_DELAY_SAMPLES 1024
+ 
  typedef struct FaacAudioContext {
      faacEncHandle faac_handle;
+     AudioFrameQueue afq;
  } FaacAudioContext;
  
 +static const int channel_maps[][6] = {
 +    { 2, 0, 1 },          //< C L R
 +    { 2, 0, 1, 3 },       //< C L R Cs
 +    { 2, 0, 1, 3, 4 },    //< C L R Ls Rs
 +    { 2, 0, 1, 4, 5, 3 }, //< C L R Ls Rs LFE
 +};
  
  static av_cold int Faac_encode_close(AVCodecContext *avctx)
  {

diff --cc libavcodec/libgsm.c
index 1a2145581addde8538c1064498d3cddee60b6100,8b0a13ba1af37d99ad5805593606a39c252eebe1..8a5ad0024f49c3a33dce76bc0ee26013a3f854d2
--- 1/libavcodec/libgsm.c
--- 2/libavcodec/libgsm.c
+++ b/libavcodec/libgsm.c
@@@ -30,15 -30,9 +30,18 @@@
  #include <gsm/gsm.h>
  
  #include "avcodec.h"
+ #include "internal.h"
  #include "gsm.h"
  
 +static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
++#if FF_API_OLD_ENCODE_AUDIO
 +    av_freep(&avctx->coded_frame);
++#endif
 +    gsm_destroy(avctx->priv_data);
 +    avctx->priv_data = NULL;
 +    return 0;
 +}
 +
  static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
      if (avctx->channels > 1) {
          av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
@@@ -78,20 -70,37 +81,29 @@@
          }
      }
  
+ #if FF_API_OLD_ENCODE_AUDIO
      avctx->coded_frame= avcodec_alloc_frame();
 -    if (!avctx->coded_frame) {
 -        gsm_destroy(avctx->priv_data);
 -        return AVERROR(ENOMEM);
 -    }
 +    if (!avctx->coded_frame)
 +        goto error;
+ #endif
  
      return 0;
 -}
 -
 -static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
 -#if FF_API_OLD_ENCODE_AUDIO
 -    av_freep(&avctx->coded_frame);
 -#endif
 -    gsm_destroy(avctx->priv_data);
 -    avctx->priv_data = NULL;
 -    return 0;
 +error:
 +    libgsm_encode_close(avctx);
 +    return -1;
  }
  
- static int libgsm_encode_frame(AVCodecContext *avctx,
-                                unsigned char *frame, int buf_size, void *data) {
-     // we need a full block
-     if(buf_size < avctx->block_align) return 0;
+ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+                                const AVFrame *frame, int *got_packet_ptr)
+ {
+     int ret;
+     gsm_signal *samples = (gsm_signal *)frame->data[0];
+     struct gsm_state *state = avctx->priv_data;
+ 
+     if ((ret = ff_alloc_packet(avpkt, avctx->block_align))) {
+         av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
+         return ret;
+     }
  
      switch(avctx->codec_id) {
      case CODEC_ID_GSM:

diff --cc libavcodec/libmp3lame.c
Simple merge

diff --cc libavcodec/libopencore-amr.c
Simple merge

diff --cc libavcodec/libspeexenc.c
Simple merge

diff --cc libavcodec/libvo-aacenc.c
Simple merge

diff --cc libavcodec/libvo-amrwbenc.c
Simple merge

diff --cc libavcodec/libvorbis.c
Simple merge

diff --cc libavcodec/mpegaudioenc.c
Simple merge

diff --cc libavcodec/nellymoserenc.c
Simple merge

diff --cc libavcodec/ra144.h
Simple merge

diff --cc libavcodec/ra144enc.c
Simple merge

diff --cc libavcodec/roqaudioenc.c
Simple merge

diff --cc libavcodec/vorbisenc.c
index dfb4c30e95a0d032d7b53e71fac250d9882989fc,3f3720979ef7a420562a4f3f554ae037c96a5472..afc8f9d17dfb4d3ed6f1c7a23f40c406ba31d265
--- 1/libavcodec/vorbisenc.c
--- 2/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@@ -1014,13 -1015,13 +1015,12 @@@ static int apply_window_and_mdct(vorbis
      return 1;
  }
  
- static int vorbis_encode_frame(AVCodecContext *avccontext,
-                                unsigned char *packets,
-                                int buf_size, void *data)
 -
+ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
+                                const AVFrame *frame, int *got_packet_ptr)
  {
      vorbis_enc_context *venc = avccontext->priv_data;
-     const signed short *audio = data;
-     int samples = data ? avccontext->frame_size : 0;
+     const int16_t *audio = frame ? (const int16_t *)frame->data[0] : NULL;
+     int samples = frame ? frame->nb_samples : 0;
      vorbis_enc_mode *mode;
      vorbis_enc_mapping *mapping;
      PutBitContext pb;

diff --cc libavcodec/wmaenc.c
index 019176a6d45129f5b689c91ecd1e9a56def45f3c,570ff4108d12ee6476515a0f16b5fe37840dba95..0b252663ed165b9c6b3c0c26c4ff713a2f887429
--- 1/libavcodec/wmaenc.c
--- 2/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@@ -20,8 -20,8 +20,9 @@@
   */
  
  #include "avcodec.h"
+ #include "internal.h"
  #include "wma.h"
 +#include "libavutil/avassert.h"
  
  #undef NDEBUG
  #include <assert.h>
@@@ -393,16 -400,23 +401,22 @@@ static int encode_superframe(AVCodecCon
      }
  #endif
  
-     encode_frame(s, s->coefs, buf, buf_size, total_gain);
 -    if ((i = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain)) >= 0) {
 -        av_log(avctx, AV_LOG_ERROR, "required frame size too large. please "
 -               "use a higher bit rate.\n");
 -        return AVERROR(EINVAL);
 -    }
 -    assert((put_bits_count(&s->pb) & 7) == 0);
 -    while (i++)
++    encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain);
 +    av_assert0((put_bits_count(&s->pb) & 7) == 0);
 +    i= s->block_align - (put_bits_count(&s->pb)+7)/8;
 +    av_assert0(i>=0);
 +    while(i--)
          put_bits(&s->pb, 8, 'N');
  
      flush_put_bits(&s->pb);
-     return s->block_align;
 +    av_assert0(put_bits_ptr(&s->pb) - s->pb.buf == s->block_align);
+ 
+     if (frame->pts != AV_NOPTS_VALUE)
+         avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->delay);
+ 
+     avpkt->size = s->block_align;
+     *got_packet_ptr = 1;
+     return 0;
  }
  
  AVCodec ff_wmav1_encoder = {

diff --cc tests/ref/acodec/g722
index 1e766d8455e84f8db9bdc65dd67a388a72c75e19,e3a5af3d7a423ca843b9978c7d38320e373f4eca..de0e5a0caafdb0366dbd76cee635672135b5b88c
--- 1/tests/ref/acodec/g722
--- 2/tests/ref/acodec/g722
+++ b/tests/ref/acodec/g722
@@@ -1,4 -1,4 +1,4 @@@
- d1a10c4d35f752f60798114a156be3a8 *./tests/data/acodec/g722.wav
 -f30e8e99cfd3f38ba66f1d4131602a19 *./tests/data/acodec/g722.wav
++e4d5ae038f29659c03fcf68818f7be6c *./tests/data/acodec/g722.wav
  48053 ./tests/data/acodec/g722.wav
 -b5568e0e3930ff563824156e8e1015f0 *./tests/data/g722.acodec.out.wav
 -stddev: 8939.44 PSNR: 17.30 MAXDIFF:40370 bytes:   191980/  1058400
 +8dafe5b74ccd5f08fed2fb2a69c5475f *./tests/data/g722.acodec.out.wav
 +stddev: 8939.47 PSNR: 17.30 MAXDIFF:40370 bytes:   191980/  1058400

diff --cc tests/ref/lavf/asf
index c6e6b6baf4b43b4919f38b6ef0294a1512768fab,0137925df44a4d53390130d6b220c548a238257a..180f98bed9f93fc7e934e795913586f3673fa5c1
--- 1/tests/ref/lavf/asf
--- 2/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@@ -1,3 -1,3 +1,3 @@@
- 3d410176ebf9ffdf99d2738922cef260 *./tests/data/lavf/lavf.asf
 -528d3cbe33288ad983a8ff5b66738976 *./tests/data/lavf/lavf.asf
 -333375 ./tests/data/lavf/lavf.asf
 -./tests/data/lavf/lavf.asf CRC=0xba1f5213
++e60b298a4db9bcedaabaaee9f90d2a42 *./tests/data/lavf/lavf.asf
 +333489 ./tests/data/lavf/lavf.asf
 +./tests/data/lavf/lavf.asf CRC=0x9f5ab3e6

diff --cc tests/ref/lavf/ffm
index 4767b9968e54eb2c29556c74bab542f04e3201f6,b95eb8bb653547dd578a6e808832128d22cdbd10..e35f7a61497923ed5a909e99b1a271e4ea988422
--- 1/tests/ref/lavf/ffm
--- 2/tests/ref/lavf/ffm
+++ b/tests/ref/lavf/ffm
@@@ -1,3 -1,3 +1,3 @@@
- 8ce2ea9a73a1187647df7bf3c8e1b8fd *./tests/data/lavf/lavf.ffm
 -0063b1b49d8641dcbf354092529a58a4 *./tests/data/lavf/lavf.ffm
++793e977bc8b7f0d86f785a9062c4d978 *./tests/data/lavf/lavf.ffm
  376832 ./tests/data/lavf/lavf.ffm
 -./tests/data/lavf/lavf.ffm CRC=0x38388ba1
 +./tests/data/lavf/lavf.ffm CRC=0xf361ed74

diff --cc tests/ref/lavf/mkv
index de8982ee46e3d3bf246bfbf1ebefdd70bed32587,5ea3638b835df2223091b7974497481d2c79fd0b..a88b47bb5e61b526787fefdb6779bb1b2c722cb9
--- 1/tests/ref/lavf/mkv
--- 2/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@@ -1,3 -1,3 +1,3 @@@
- f99ae18e1212ee184188243107a4b824 *./tests/data/lavf/lavf.mkv
 -2c6fbc2c818c849e77702141294d775d *./tests/data/lavf/lavf.mkv
 -320262 ./tests/data/lavf/lavf.mkv
 -./tests/data/lavf/lavf.mkv CRC=0xd86284dd
++19c989b2a18dc352ede9754af5fcb5f2 *./tests/data/lavf/lavf.mkv
 +320521 ./tests/data/lavf/lavf.mkv
- ./tests/data/lavf/lavf.mkv CRC=0x2a83e6b0
++./tests/data/lavf/lavf.mkv CRC=0x5b4ae6b0

diff --cc tests/ref/lavf/mpg
index a22e2088a6922feb1056c730365bc6fa14b526fb,e76f7479f02c01ea5d5d90ddabb5fea92f9e3362..fe55f51aebc1f4c81bea04a392d123d5fe097803
--- 1/tests/ref/lavf/mpg
--- 2/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@@ -1,9 -1,3 +1,9 @@@
- 6103dbae73aec6c9bf05bbbc6ea35f89 *./tests/data/lavf/lavf.mpg
 -af32acbc73ee486b05a37d53e516d5e7 *./tests/data/lavf/lavf.mpg
++855384c0cd3d0e3843d48698441c1384 *./tests/data/lavf/lavf.mpg
  372736 ./tests/data/lavf/lavf.mpg
 -./tests/data/lavf/lavf.mpg CRC=0x38388ba1
 +./tests/data/lavf/lavf.mpg CRC=0xf361ed74
- 91b42dd3352e21dd0dee57f6a7241ca2 *./tests/data/lavf/lavf.mpg
++612b686e2c035b18175ccefdacf9532c *./tests/data/lavf/lavf.mpg
 +387072 ./tests/data/lavf/lavf.mpg
 +./tests/data/lavf/lavf.mpg CRC=0x3d6ddf56
- dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg
++fcf2c242b41373186d43de3d5c518e5a *./tests/data/lavf/lavf.mpg
 +372736 ./tests/data/lavf/lavf.mpg
 +./tests/data/lavf/lavf.mpg CRC=0xf361ed74

diff --cc tests/ref/lavf/rm
index e1fd6d5671a65b107683efcfbc67c3b921307b67,188d15d932e54e25b17d991840502b9e7d0855c6..d2a094763c001db476add63a58a155d05d72b411
--- 1/tests/ref/lavf/rm
--- 2/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@@ -1,2 -1,2 +1,2 @@@
- 2b0eebb5814825c9c4b385cbf8e5b0da *./tests/data/lavf/lavf.rm
 -c002d460bc77043ced69fd00f4ae7968 *./tests/data/lavf/lavf.rm
 -346414 ./tests/data/lavf/lavf.rm
++be73bce6e371fd543f93f668406f3430 *./tests/data/lavf/lavf.rm
 +346714 ./tests/data/lavf/lavf.rm

diff --cc tests/ref/lavf/ts
index 18566c47bc6f0d5fbb5092b3d8487926f7660394,333149e058755fbd1f629f5bcc119ff859d89d46..716216e2cbeac6fff4d41a8575f78488192d9605
--- 1/tests/ref/lavf/ts
--- 2/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@@ -1,3 -1,3 +1,3 @@@
- 34f95a300355d474767b436430eba15b *./tests/data/lavf/lavf.ts
 -ec8df9c78de8f7f20a3eb1ce8f863c02 *./tests/data/lavf/lavf.ts
 -406456 ./tests/data/lavf/lavf.ts
 -./tests/data/lavf/lavf.ts CRC=0x0fdeb4df
++258a64dbc1724438e90560294be4be5c *./tests/data/lavf/lavf.ts
 +  406644 ./tests/data/lavf/lavf.ts
 +./tests/data/lavf/lavf.ts CRC=0x133216c1

diff --cc tests/ref/lavf/wtv
index f0668a7d723241906fbe594d50c2201758e067d1,0000000000000000000000000000000000000000..d0a3ad742fa46b1b0cb91b2a752c36e9274ee392
mode 100644,000000..100644
--- 1/tests/ref/lavf/wtv
--- /dev/null
+++ b/tests/ref/lavf/wtv
@@@ -1,3 -1,0 +1,3 @@@
- 7bd312f32538a14f248c2dff85394118 *./tests/data/lavf/lavf.wtv
++de9c3be54bafeba1b7f9618609bd0f62 *./tests/data/lavf/lavf.wtv
 +413696 ./tests/data/lavf/lavf.wtv
 +./tests/data/lavf/lavf.wtv CRC=0x133216c1

diff --cc tests/ref/seek/lavf_asf
index 5aee39e049c1a969c4000c5356b3d58a1466d222,e1d6d32a8483dc7f2137a864009c1157d42f3724..c05078b09e16f0ed3c01454ba881ea4ebd810431
--- 1/tests/ref/seek/lavf_asf
--- 2/tests/ref/seek/lavf_asf
+++ b/tests/ref/seek/lavf_asf
@@@ -1,53 -1,53 +1,53 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 0 flags:0  ts: 0.788000
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 0 flags:1  ts:-0.317000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st: 1 flags:0  ts: 2.577000
- ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330289 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
  ret: 0         st: 1 flags:1  ts: 1.471000
- ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330289 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
  ret: 0         st:-1 flags:0  ts: 0.365002
- ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147889 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
++ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
  ret: 0         st:-1 flags:1  ts:-0.740831
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st: 0 flags:0  ts: 2.153000
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 0 flags:1  ts: 1.048000
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 1 flags:0  ts:-0.058000
- ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:  29489 size:   208
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st: 1 flags:1  ts: 2.836000
- ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330289 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147889 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
++ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
  ret: 0         st: 0 flags:0  ts:-0.482000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st: 0 flags:1  ts: 2.413000
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 1 flags:0  ts: 1.307000
- ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330289 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
  ret: 0         st: 1 flags:1  ts: 0.201000
- ret: 0         st: 1 flags:1 dts: 0.183000 pts: 0.183000 pos:  71089 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.198000 pts: 0.198000 pos:  74175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.198000 pts: 0.198000 pos:  74289 size:   209
  ret: 0         st:-1 flags:0  ts:-0.904994
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st:-1 flags:1  ts: 1.989173
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 0 flags:0  ts: 0.883000
- ret: 0         st: 1 flags:1 dts: 0.940000 pts: 0.940000 pos: 301489 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301375 size:   209
++ret: 0         st: 1 flags:1 dts: 0.930000 pts: 0.930000 pos: 301489 size:   209
  ret: 0         st: 0 flags:1  ts:-0.222000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208
  ret: 0         st: 1 flags:0  ts: 2.672000
- ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330289 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
  ret: 0         st: 1 flags:1  ts: 1.566000
- ret: 0         st: 1 flags:1 dts: 0.967000 pts: 0.967000 pos: 330289 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330175 size:   209
++ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 330289 size:   209
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 1 flags:1 dts: 0.444000 pts: 0.444000 pos: 147889 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147775 size:   209
++ret: 0         st: 1 flags:1 dts: 0.459000 pts: 0.459000 pos: 147889 size:   209
  ret: 0         st:-1 flags:1  ts:-0.645825
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    689 size: 28487
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    575 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    689 size:   208

diff --cc tests/ref/seek/lavf_ffm
index 2218d4fd85318f3eef14d6c19892193a7c077f65,259722050fc7ad70b2a1fe474d08773c41b7622a..141def8e702e7de06a28b8c505d416541326f300
--- 1/tests/ref/seek/lavf_ffm
--- 2/tests/ref/seek/lavf_ffm
+++ b/tests/ref/seek/lavf_ffm
@@@ -2,17 -2,17 +2,17 @@@ ret: 0         st: 0 flags:1 dts:-0.040
  ret: 0         st:-1 flags:0  ts:-1.000000
  ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24664
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 1 flags:1 dts: 0.940408 pts: 0.940408 pos: 376832 size:   209
+ ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
  ret: 0         st: 0 flags:0  ts: 0.788334
- ret: 0         st: 1 flags:1 dts: 0.809796 pts: 0.809796 pos: 327680 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.772766 pts: 0.772766 pos: 315392 size:   209
++ret: 0         st: 1 flags:1 dts: 0.825011 pts: 0.825011 pos: 327680 size:   209
  ret: 0         st: 0 flags:1  ts:-0.317499
  ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24664
  ret: 0         st: 1 flags:0  ts: 2.576668
- ret: 0         st: 1 flags:1 dts: 0.940408 pts: 0.940408 pos: 376832 size:   209
+ ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
  ret: 0         st: 1 flags:1  ts: 1.470835
- ret: 0         st: 1 flags:1 dts: 0.940408 pts: 0.940408 pos: 376832 size:   209
+ ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
  ret: 0         st:-1 flags:0  ts: 0.365002
- ret: 0         st: 1 flags:1 dts: 0.365714 pts: 0.365714 pos: 163840 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.328685 pts: 0.328685 pos: 155648 size:   209
++ret: 0         st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 167936 size:   209
  ret: 0         st:-1 flags:1  ts:-0.740831
  ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24664
  ret: 0         st: 0 flags:0  ts: 2.153336
@@@ -44,10 -44,10 +44,10 @@@ ret: 0         st: 1 flags:1 dts: 0.877
  ret: 0         st: 0 flags:1  ts:-0.222493
  ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24664
  ret: 0         st: 1 flags:0  ts: 2.671674
- ret: 0         st: 1 flags:1 dts: 0.940408 pts: 0.940408 pos: 376832 size:   209
+ ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
  ret: 0         st: 1 flags:1  ts: 1.565841
- ret: 0         st: 1 flags:1 dts: 0.940408 pts: 0.940408 pos: 376832 size:   209
+ ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 1 flags:1 dts: 0.496327 pts: 0.496327 pos: 221184 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.459297 pts: 0.459297 pos: 204800 size:   209
++ret: 0         st: 1 flags:1 dts: 0.485420 pts: 0.485420 pos: 221184 size:   209
  ret: 0         st:-1 flags:1  ts:-0.645825
  ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24664

diff --cc tests/ref/seek/lavf_mkv
index 4f727864de7b59b773a50a08b987ed54ec88d24b,0f76f344c5b9784a7e7aabc8b7b00ef04d7d486a..4e7966bbd7eaac4a930c30c855140f3bda80e5a0
--- 1/tests/ref/seek/lavf_mkv
--- 2/tests/ref/seek/lavf_mkv
+++ b/tests/ref/seek/lavf_mkv
@@@ -1,48 -1,53 +1,48 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos:    555 size:   208
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208
  ret: 0         st:-1 flags:1  ts: 1.894167
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 291977 size: 27834
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
  ret: 0         st: 0 flags:0  ts: 0.788000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 291977 size: 27834
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
  ret: 0         st: 0 flags:1  ts:-0.317000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
 -ret: 0         st: 1 flags:0  ts: 2.577000
 -ret:-EOF
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208
 +ret:-1         st: 1 flags:0  ts: 2.577000
  ret: 0         st: 1 flags:1  ts: 1.471000
- ret: 0         st: 1 flags:1 dts: 1.019000 pts: 1.019000 pos: 320250 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 319991 size:   209
++ret: 0         st: 1 flags:1 dts: 1.008000 pts: 1.008000 pos: 320250 size:   209
  ret: 0         st:-1 flags:0  ts: 0.365002
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146703 size: 27925
 +ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146746 size: 27925
  ret: 0         st:-1 flags:1  ts:-0.740831
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
 -ret: 0         st: 0 flags:0  ts: 2.153000
 -ret:-EOF
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208
 +ret:-1         st: 0 flags:0  ts: 2.153000
  ret: 0         st: 0 flags:1  ts: 1.048000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 291977 size: 27834
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
  ret: 0         st: 1 flags:0  ts:-0.058000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.015000 pts: 0.015000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts: 0.015000 pts: 0.015000 pos:    555 size:   208
  ret: 0         st: 1 flags:1  ts: 2.836000
- ret: 0         st: 1 flags:1 dts: 1.019000 pts: 1.019000 pos: 320250 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 319991 size:   209
 -ret: 0         st:-1 flags:0  ts: 1.730004
 -ret:-EOF
++ret: 0         st: 1 flags:1 dts: 1.008000 pts: 1.008000 pos: 320250 size:   209
 +ret:-1         st:-1 flags:0  ts: 1.730004
  ret: 0         st:-1 flags:1  ts: 0.624171
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146703 size: 27925
 +ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146746 size: 27925
  ret: 0         st: 0 flags:0  ts:-0.482000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208
  ret: 0         st: 0 flags:1  ts: 2.413000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 291977 size: 27834
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
 -ret: 0         st: 1 flags:0  ts: 1.307000
 -ret:-EOF
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
 +ret:-1         st: 1 flags:0  ts: 1.307000
  ret: 0         st: 1 flags:1  ts: 0.201000
- ret: 0         st: 1 flags:1 dts: 0.183000 pts: 0.183000 pos:  72126 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.198000 pts: 0.198000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts: 0.198000 pts: 0.198000 pos:    555 size:   208
  ret: 0         st:-1 flags:0  ts:-0.904994
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208
  ret: 0         st:-1 flags:1  ts: 1.989173
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 291977 size: 27834
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
  ret: 0         st: 0 flags:0  ts: 0.883000
- ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 291977 size: 27834
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292150 size: 27834
++ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
  ret: 0         st: 0 flags:1  ts:-0.222000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
 -ret: 0         st: 1 flags:0  ts: 2.672000
 -ret:-EOF
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208
 +ret:-1         st: 1 flags:0  ts: 2.672000
  ret: 0         st: 1 flags:1  ts: 1.566000
- ret: 0         st: 1 flags:1 dts: 1.019000 pts: 1.019000 pos: 320250 size:   209
 -ret: 0         st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 319991 size:   209
++ret: 0         st: 1 flags:1 dts: 1.008000 pts: 1.008000 pos: 320250 size:   209
  ret: 0         st:-1 flags:0  ts: 0.460008
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146703 size: 27925
 +ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146746 size: 27925
  ret: 0         st:-1 flags:1  ts:-0.645825
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    556 size: 27837
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    512 size:   208
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    555 size:   208

diff --cc tests/ref/seek/lavf_mpg
index ccecf2ba5b7960f0cf8b52efb98ef7a33c05c8fc,0f0d720298cadf29cb5a9991b54b2ca82671f919..52e289b1ccd05a9123f122aa6f38bb99e9d74b5f
--- 1/tests/ref/seek/lavf_mpg
--- 2/tests/ref/seek/lavf_mpg
+++ b/tests/ref/seek/lavf_mpg
@@@ -4,50 -4,50 +4,50 @@@ ret: 0         st: 1 flags:1 dts: 0.989
  ret: 0         st:-1 flags:1  ts: 1.894167
  ret: 0         st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 327680 size: 12894
  ret: 0         st: 0 flags:0  ts: 0.788333
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 0 flags:1  ts:-0.317500
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 1 flags:0  ts: 2.576667
- ret: 0         st: 1 flags:1 dts: 2.018778 pts: 2.018778 pos: 370700 size:   235
 -ret: 0         st: 1 flags:1 dts: 1.772767 pts: 1.772767 pos: 368652 size:   379
++ret: 0         st: 1 flags:1 dts: 2.007867 pts: 2.007867 pos: 370700 size:   235
  ret: 0         st: 1 flags:1  ts: 1.470833
- ret: 0         st: 1 flags:1 dts: 1.261222 pts: 1.261222 pos: 145408 size:   261
+ ret: 0         st: 1 flags:1 dts: 1.250322 pts: 1.250322 pos: 145408 size:   261
  ret: 0         st:-1 flags:0  ts: 0.365002
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st:-1 flags:1  ts:-0.740831
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 0 flags:0  ts: 2.153333
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
 +ret: 0         st: 0 flags:0 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
  ret: 0         st: 0 flags:1  ts: 1.047500
  ret: 0         st: 0 flags:0 dts: 1.040000 pts: 1.080000 pos:  40960 size: 16073
  ret: 0         st: 1 flags:0  ts:-0.058333
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 1 flags:1  ts: 2.835833
- ret: 0         st: 1 flags:1 dts: 2.018778 pts: 2.018778 pos: 370700 size:   235
 -ret: 0         st: 1 flags:1 dts: 1.772767 pts: 1.772767 pos: 368652 size:   379
++ret: 0         st: 1 flags:1 dts: 2.007867 pts: 2.007867 pos: 370700 size:   235
  ret: 0         st:-1 flags:0  ts: 1.730004
  ret: 0         st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 292864 size: 13170
  ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 0 flags:0  ts:-0.481667
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 0 flags:1  ts: 2.412500
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
 +ret: 0         st: 0 flags:0 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
  ret: 0         st: 1 flags:0  ts: 1.306667
- ret: 0         st: 1 flags:1 dts: 1.522444 pts: 1.522444 pos: 342028 size:   314
+ ret: 0         st: 1 flags:1 dts: 1.511544 pts: 1.511544 pos: 342028 size:   314
  ret: 0         st: 1 flags:1  ts: 0.200844
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st:-1 flags:0  ts:-0.904994
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st:-1 flags:1  ts: 1.989173
 -ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
 +ret: 0         st: 0 flags:0 dts: 1.920000 pts: 1.960000 pos: 339968 size:   681
  ret: 0         st: 0 flags:0  ts: 0.883344
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 0 flags:1  ts:-0.222489
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st: 1 flags:0  ts: 2.671678
- ret: 0         st: 1 flags:1 dts: 2.018778 pts: 2.018778 pos: 370700 size:   235
 -ret: 0         st: 1 flags:1 dts: 1.772767 pts: 1.772767 pos: 368652 size:   379
++ret: 0         st: 1 flags:1 dts: 2.007867 pts: 2.007867 pos: 370700 size:   235
  ret: 0         st: 1 flags:1  ts: 1.565844
- ret: 0         st: 1 flags:1 dts: 1.522444 pts: 1.522444 pos: 342028 size:   314
+ ret: 0         st: 1 flags:1 dts: 1.511544 pts: 1.511544 pos: 342028 size:   314
  ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208
  ret: 0         st:-1 flags:1  ts:-0.645825
- ret: 0         st: 1 flags:1 dts: 1.000000 pts: 1.000000 pos:   2048 size:   208
+ ret: 0         st: 1 flags:1 dts: 0.989089 pts: 0.989089 pos:   2048 size:   208

diff --cc tests/ref/seek/lavf_rm
index 208a52789bacf9217614d9fea40a91f53453081f,adce9e08956597cbb1ca5abbd92dd4034f6d2dfd..bd7aa9cd28f286d86b5f2537a38c7358d603d510
--- 1/tests/ref/seek/lavf_rm
--- 2/tests/ref/seek/lavf_rm
+++ b/tests/ref/seek/lavf_rm
@@@ -1,53 -1,53 +1,53 @@@
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    387 size:   278
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    395 size:   278
  ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
  ret: 0         st:-1 flags:1  ts: 1.894167
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 0 flags:0  ts: 0.788000
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 0 flags:1  ts:-0.317000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
  ret: 0         st: 1 flags:0  ts: 2.577000
 -ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346136 size:   278
  ret: 0         st: 1 flags:1  ts: 1.471000
 -ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346136 size:   278
  ret: 0         st:-1 flags:0  ts: 0.365002
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158515 size: 31134
 +ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158523 size: 31134
  ret: 0         st:-1 flags:1  ts:-0.740831
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
  ret: 0         st: 0 flags:0  ts: 2.153000
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 0 flags:1  ts: 1.048000
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 1 flags:0  ts:-0.058000
- ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:  31491 size:   278
 -ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    387 size:   278
++ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    395 size:   278
  ret: 0         st: 1 flags:1  ts: 2.836000
 -ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346136 size:   278
  ret: 0         st:-1 flags:0  ts: 1.730004
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st:-1 flags:1  ts: 0.624171
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158515 size: 31134
 +ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158523 size: 31134
  ret: 0         st: 0 flags:0  ts:-0.482000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
  ret: 0         st: 0 flags:1  ts: 2.413000
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 1 flags:0  ts: 1.307000
 -ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346136 size:   278
  ret: 0         st: 1 flags:1  ts: 0.201000
 -ret: 0         st: 1 flags:1 dts: 0.174000 pts: 0.174000 pos:  78969 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.174000 pts: 0.174000 pos:  78977 size:   278
  ret: 0         st:-1 flags:0  ts:-0.904994
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
  ret: 0         st:-1 flags:1  ts: 1.989173
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 0 flags:0  ts: 0.883000
 -ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
 +ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314990 size: 31143
  ret: 0         st: 0 flags:1  ts:-0.222000
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
  ret: 0         st: 1 flags:0  ts: 2.672000
 -ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346136 size:   278
  ret: 0         st: 1 flags:1  ts: 1.566000
 -ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
 +ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346136 size:   278
  ret: 0         st:-1 flags:0  ts: 0.460008
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158515 size: 31134
 +ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158523 size: 31134
  ret: 0         st:-1 flags:1  ts:-0.645825
- ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    406 size: 31082
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082

diff --cc tests/ref/seek/lavf_ts
index 690228d741ba052c770d13c4f709af817f8f72b2,81093b7c9388de77029515fa324485a6c9cfd940..4634e03bf99c6a7f69dc3dd26ceab648992b5c50
--- 1/tests/ref/seek/lavf_ts
--- 2/tests/ref/seek/lavf_ts
+++ b/tests/ref/seek/lavf_ts
@@@ -8,46 -8,46 +8,46 @@@ ret: 0         st: 0 flags:1 dts: 1.360
  ret: 0         st: 0 flags:1  ts:-0.317500
  ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 1 flags:0  ts: 2.576667
- ret: 0         st: 1 flags:1 dts: 2.131433 pts: 2.131433 pos: 404012 size:   209
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
++ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size:   209
  ret: 0         st: 1 flags:1  ts: 1.470833
- ret: 0         st: 1 flags:1 dts: 1.400000 pts: 1.400000 pos: 172584 size:   208
 -ret: 0         st: 0 flags:0 dts: 2.160000 pts: 2.200000 pos: 325240 size: 12679
++ret: 0         st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size:   208
  ret: 0         st:-1 flags:0  ts: 0.365002
 -ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
 +ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st:-1 flags:1  ts:-0.740831
  ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 0 flags:0  ts: 2.153333
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
 +ret: 0         st: 0 flags:0 dts: 2.160000 pts: 2.200000 pos: 325616 size: 12679
  ret: 0         st: 0 flags:1  ts: 1.047500
 -ret: 0         st: 0 flags:0 dts: 1.680000 pts: 1.720000 pos: 130096 size: 14133
 +ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 1 flags:0  ts:-0.058333
- ret: 0         st: 1 flags:1 dts: 1.400000 pts: 1.400000 pos: 172584 size:   208
 -ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
++ret: 0         st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size:   208
  ret: 0         st: 1 flags:1  ts: 2.835833
- ret: 0         st: 1 flags:1 dts: 2.131433 pts: 2.131433 pos: 404012 size:   209
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
++ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size:   209
  ret: 0         st:-1 flags:0  ts: 1.730004
- ret: 0         st: 1 flags:1 dts: 1.400000 pts: 1.400000 pos: 172584 size:   208
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
++ret: 0         st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 162808 size: 12075
  ret: 0         st:-1 flags:1  ts: 0.624171
  ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 0 flags:0  ts:-0.481667
 -ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
 +ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 0 flags:1  ts: 2.412500
- ret: 0         st: 1 flags:1 dts: 2.131433 pts: 2.131433 pos: 404012 size:   209
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
++ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size:   209
  ret: 0         st: 1 flags:0  ts: 1.306667
- ret: 0         st: 1 flags:1 dts: 1.400000 pts: 1.400000 pos: 172584 size:   208
 -ret: 0         st: 0 flags:0 dts: 2.080000 pts: 2.120000 pos: 294032 size: 13839
++ret: 0         st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size:   208
  ret: 0         st: 1 flags:1  ts: 0.200844
- ret: 0         st: 1 flags:1 dts: 1.400000 pts: 1.400000 pos: 172584 size:   208
 -ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
++ret: 0         st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size:   208
  ret: 0         st:-1 flags:0  ts:-0.904994
 -ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
 +ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st:-1 flags:1  ts: 1.989173
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
 +ret: 0         st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 250980 size: 13438
  ret: 0         st: 0 flags:0  ts: 0.883344
 -ret: 0         st: 0 flags:0 dts: 1.600000 pts: 1.640000 pos: 102836 size: 12781
 +ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 0 flags:1  ts:-0.222489
  ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st: 1 flags:0  ts: 2.671678
- ret: 0         st: 1 flags:1 dts: 2.131433 pts: 2.131433 pos: 404012 size:   209
 -ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 403636 size:   209
++ret: 0         st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size:   209
  ret: 0         st: 1 flags:1  ts: 1.565844
- ret: 0         st: 1 flags:1 dts: 1.400000 pts: 1.400000 pos: 172584 size:   208
 -ret: 0         st: 0 flags:0 dts: 2.240000 pts: 2.280000 pos: 350996 size: 11307
++ret: 0         st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size:   208
  ret: 0         st:-1 flags:0  ts: 0.460008
 -ret: 0         st: 0 flags:0 dts: 1.440000 pts: 1.480000 pos:  44932 size: 14502
 +ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801
  ret: 0         st:-1 flags:1  ts:-0.645825
  ret: 0         st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos:    564 size: 24801

diff --cc tests/ref/seek/lavf_wtv
index 20c0bb32ab7fdae11f56d640553c25c12d133d7b,0000000000000000000000000000000000000000..9db9632398faa7750db78bb5ef858936d6c3a39b
mode 100644,000000..100644
--- 1/tests/ref/seek/lavf_wtv
--- /dev/null
+++ b/tests/ref/seek/lavf_wtv
@@@ -1,41 -1,0 +1,41 @@@
- ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret: 0         st:-1 flags:0  ts:-1.000000
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st:-1 flags:1  ts: 1.894167
 +ret: 0         st: 0 flags:0  ts: 0.788334
- ret: 0         st: 1 flags:1 dts: 0.783674 pts: 0.783674 pos: 321176 size:   209
++ret: 0         st: 1 flags:1 dts: 0.772766 pts: 0.772766 pos: 321176 size:   209
 +ret: 0         st: 0 flags:1  ts:-0.317499
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st: 1 flags:0  ts: 2.576668
 +ret:-1         st: 1 flags:1  ts: 1.470835
 +ret: 0         st:-1 flags:0  ts: 0.365002
- ret: 0         st: 1 flags:1 dts: 0.365714 pts: 0.365714 pos: 167160 size:   209
++ret: 0         st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 167496 size:   209
 +ret: 0         st:-1 flags:1  ts:-0.740831
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st: 0 flags:0  ts: 2.153336
 +ret:-1         st: 0 flags:1  ts: 1.047503
 +ret: 0         st: 1 flags:0  ts:-0.058330
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st: 1 flags:1  ts: 2.835837
 +ret:-1         st:-1 flags:0  ts: 1.730004
 +ret: 0         st:-1 flags:1  ts: 0.624171
- ret: 0         st: 1 flags:1 dts: 0.600816 pts: 0.600816 pos: 266240 size:   209
++ret: 0         st: 1 flags:1 dts: 0.616032 pts: 0.616032 pos: 266576 size:   209
 +ret: 0         st: 0 flags:0  ts:-0.481662
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st: 0 flags:1  ts: 2.412505
 +ret:-1         st: 1 flags:0  ts: 1.306672
 +ret: 0         st: 1 flags:1  ts: 0.200839
- ret: 0         st: 1 flags:1 dts: 0.208980 pts: 0.208980 pos: 113304 size:   209
++ret: 0         st: 1 flags:1 dts: 0.224195 pts: 0.224195 pos: 113640 size:   209
 +ret: 0         st:-1 flags:0  ts:-0.904994
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st:-1 flags:1  ts: 1.989173
 +ret: 0         st: 0 flags:0  ts: 0.883340
- ret: 0         st: 1 flags:1 dts: 0.888163 pts: 0.888163 pos: 357608 size:   209
++ret: 0         st: 1 flags:1 dts: 0.903379 pts: 0.903379 pos: 357944 size:   209
 +ret: 0         st: 0 flags:1  ts:-0.222493
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208
 +ret:-1         st: 1 flags:0  ts: 2.671674
 +ret:-1         st: 1 flags:1  ts: 1.565841
 +ret: 0         st:-1 flags:0  ts: 0.460008
- ret: 0         st: 1 flags:1 dts: 0.444082 pts: 0.444082 pos: 205440 size:   209
++ret: 0         st: 1 flags:1 dts: 0.459297 pts: 0.459297 pos: 205776 size:   209
 +ret: 0         st:-1 flags:1  ts:-0.645825
- ret: 0         st: 0 flags:1 dts: NOPTS    pts: 0.000000 pos:   2144 size: 24801
++ret: 0         st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos:  27072 size:   208