summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 17:30:52 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 17:41:31 +0100
commit6db37c9468051ff34cac58fa428bc5d86fc1ee45 (patch)
treeac578a2ae106cb9a15f37769a87f5d4cf1dd3405 /ffmpeg.c
parent71cf094e1be086bce4c535b1fe0d96a0449486ae (diff)
parent5c7db097ebe1fb5c233cedd8846615074e7d6044 (diff)
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>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
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);
}
}
}