diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
| commit | e16665bf72d226b2c87c76a677414b8ef7720d7e (patch) | |
| tree | b68414614d4ce2eecee89185f80a30a039899bb2 /libavcodec/avcodec.h | |
| parent | 03ac7991286c583c73c8c44c71aeba1265c61cba (diff) | |
| parent | d9dee728b8c50fb6dbff3701e1abcb2eac5895b3 (diff) | |
| download | ffmpeg-e16665bf72d226b2c87c76a677414b8ef7720d7e.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1919b2cd33..10866a1ee0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4172,7 +4172,7 @@ void av_log_missing_feature(void *avc, const char *feature, int want_sample); * a pointer to an AVClass struct * @param[in] msg string containing an optional message, or NULL if no message */ -void av_log_ask_for_sample(void *avc, const char *msg); +void av_log_ask_for_sample(void *avc, const char *msg, ...); /** * Register the hardware accelerator hwaccel. |