diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:30:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:41:31 +0100 |
| commit | 6db37c9468051ff34cac58fa428bc5d86fc1ee45 (patch) | |
| tree | ac578a2ae106cb9a15f37769a87f5d4cf1dd3405 /cmdutils.h | |
| parent | 71cf094e1be086bce4c535b1fe0d96a0449486ae (diff) | |
| parent | 5c7db097ebe1fb5c233cedd8846615074e7d6044 (diff) | |
| download | ffmpeg-6db37c9468051ff34cac58fa428bc5d86fc1ee45.tar.gz | |
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 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.h b/cmdutils.h index 71b6a2f873..3e3d002e7a 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -52,7 +52,7 @@ extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB]; extern AVFormatContext *avformat_opts; extern struct SwsContext *sws_opts; extern struct SwrContext *swr_opts; -extern AVDictionary *format_opts, *codec_opts; +extern AVDictionary *format_opts, *codec_opts, *resample_opts; /** * Initialize the cmdutils option system, in particular @@ -253,6 +253,7 @@ typedef struct OptionGroup { AVDictionary *codec_opts; AVDictionary *format_opts; + AVDictionary *resample_opts; struct SwsContext *sws_opts; struct SwrContext *swr_opts; } OptionGroup; |