diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-27 02:14:37 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-27 02:14:37 +0200 |
commit | 7c1aba4f01a10915d356c7bc0c6bfed25cbb623e (patch) | |
tree | a3452b5224630d3ea4ace5f2d143051c7aab5c8d /cmdutils.h | |
parent | c2a016ad4d9c29285813ba5806189e63e063e0fb (diff) | |
parent | 908f12f342341785bf0458e88a06d97a1af90339 (diff) | |
download | ffmpeg-7c1aba4f01a10915d356c7bc0c6bfed25cbb623e.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (21 commits)
fate: allow testing with libavfilter disabled
x86: XOP/FMA4 CPU detection support
ws_snd: misc cosmetic clean-ups
ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
ws_snd: use memcpy() and memset() instead of loops
ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
ws_snd: make sure number of channels is 1
ws_snd: add some checks to prevent buffer overread or overwrite.
ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
flacdec: fix buffer size checking in get_metadata_size()
rtp: Simplify ff_rtp_get_payload_type
rtpenc: Add a payload type private option
rtp: Correct ff_rtp_get_payload_type documentation
avconv: replace all fprintf() by av_log().
avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
cmdutils: replace fprintf() by av_log()
avtools: parse loglevel before all the other options.
oggdec: add support for Xiph's CELT codec
sol: return error if av_get_packet() fails.
cosmetics: reindent and pretty-print
...
Conflicts:
avconv.c
cmdutils.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/oggparsecelt.c
libavformat/utils.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
-rw-r--r-- | cmdutils.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmdutils.h b/cmdutils.h index 005697e7c5..85b6c55835 100644 --- a/cmdutils.h +++ b/cmdutils.h @@ -179,6 +179,11 @@ void parse_options(void *optctx, int argc, char **argv, const OptionDef *options int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options); /** + * Find the '-loglevel' option in the commandline args and apply it. + */ +void parse_loglevel(int argc, char **argv, const OptionDef *options); + +/** * Check if the given stream matches a stream specifier. * * @param s Corresponding format context. |