Merge branch 'master' into release/0.9

* master: (87 commits)
  manpage: move --autosync description
  player: add --window-scale option
  player: flush decoder even if cover art is decoded
  player: don't show A/V desync message in non-sense situations
  w32_common: add more rounded-down frame rates
  w32_common: use the current monitor's refresh rate
  dxva2: fix broken build with gcc 5.1
  terminal: printf() is not signal-safe
  man: fix PDF build
  DOCS/mplayer-changes: Eleborate on joystick input
  osc: add nil check for element.eventresponder
  mp_image: remove some unused interlacing flags
  vf_vapoursynth: update _FieldBased semantics
  options: remove unneeded hack from command line parser
  manpage: document ff-index sub-property
  demux_mkv: limit timestamp fixing to 1ms max
  demux_mkv: attempt to fix rounded timestamps
  demux_mkv: move global options to the demuxer
  demux_mkv: better seeking after video end
  lua: add utils.format_json() function
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c
index 41d5a8bdf4..412846a78e 100644
--- a/audio/filter/af_lavrresample.c
+++ b/audio/filter/af_lavrresample.c
@@ -318,17 +318,17 @@ static int control(struct af_instance *af, int cmd, void *arg)
         if (new_rate != s->ctx.in_rate && s->avrctx_ok && af->fmt_out.format) {
             // Before reconfiguring, drain the audio that is still buffered
             // in the resampler.
-            talloc_free(s->pending);
-            s->pending = talloc_zero(NULL, struct mp_audio);
-            mp_audio_copy_config(s->pending, &af->fmt_out);
-            s->pending->samples = get_drain_samples(s);
-            if (s->pending->samples > 0) {
-                mp_audio_realloc_min(s->pending, s->pending->samples);
-                int r = resample_frame(s->avrctx, s->pending, NULL);
-                s->pending->samples = MPMAX(r, 0);
+            struct mp_audio *pending = talloc_zero(NULL, struct mp_audio);
+            mp_audio_copy_config(pending, &af->fmt_out);
+            pending->samples = get_drain_samples(s);
+            if (pending->samples > 0) {
+                mp_audio_realloc_min(pending, pending->samples);
+                int r = resample_frame(s->avrctx, pending, NULL);
+                pending->samples = MPMAX(r, 0);
             }
             // Reinitialize resampler.
             configure_lavrr(af, &af->fmt_in, &af->fmt_out);
+            s->pending = pending;
         }
         return AF_OK;
     }