Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c

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

1 files changed, 1 insertions, 0 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 6c3994f0d4..cecd763584 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3212,6 +3212,7 @@ static int transcode(void)
                 av_freep(&ost->st->codec->subtitle_header);
                 av_free(ost->forced_kf_pts);
                 av_dict_free(&ost->opts);
+                av_dict_free(&ost->resample_opts);
             }
         }
     }