diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-30 02:12:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-30 02:12:53 +0100 |
| commit | 4aa9c91508203fdcaa687abff2d8d4ae46d4cde6 (patch) | |
| tree | 720510e61e5045d8775eff5219c8e82799ebd029 /cmdutils.h | |
| parent | e80aa47abf74b9dda336d3e156fb49402093ec44 (diff) | |
| parent | de40905f55cdd668b50a143f8e30936d22a09a37 (diff) | |
| download | ffmpeg-4aa9c91508203fdcaa687abff2d8d4ae46d4cde6.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix condition for transparency warning in xsub encoder.
Allow hiding the banner.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
| -rw-r--r-- | cmdutils.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmdutils.h b/cmdutils.h index f4f23ef835..d1e1ecbe7e 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -48,6 +48,7 @@ extern AVFormatContext *avformat_opts; extern struct SwsContext *sws_opts; extern AVDictionary *swr_opts; extern AVDictionary *format_opts, *codec_opts, *resample_opts; +extern int hide_banner; /** * Register a program-specific cleanup routine. |