diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:38:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:38:02 +0100 |
| commit | af4b1c02acf6923489d30349c4813a0d73b2f114 (patch) | |
| tree | 72ba1faae0a32c3850d8a15fc07f282fec06c33c /cmdutils.c | |
| parent | 52b866471ec97dd03d92ad1df4c5bdba54f285c0 (diff) | |
| parent | 77bd1bc73a1946b0f0ce09a7cbb242a65e138d06 (diff) | |
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index dc32807b55..c1b81a176b 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -568,6 +568,7 @@ static void finish_group(OptionParseContext *octx, int group_idx, #if CONFIG_SWSCALE g->sws_opts = sws_opts; #endif + g->swr_opts = swr_opts; g->codec_opts = codec_opts; g->format_opts = format_opts; @@ -576,6 +577,7 @@ static void finish_group(OptionParseContext *octx, int group_idx, #if CONFIG_SWSCALE sws_opts = NULL; #endif + swr_opts = NULL; init_opts(); memset(&octx->cur_group, 0, sizeof(octx->cur_group)); @@ -635,6 +637,8 @@ void uninit_parse_context(OptionParseContext *octx) #if CONFIG_SWSCALE sws_freeContext(l->groups[j].sws_opts); #endif + if(CONFIG_SWRESAMPLE) + swr_free(&l->groups[j].swr_opts); } av_freep(&l->groups); } |