diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-04 04:11:53 +0200 |
| commit | 1889c6724a449b2e4826612d3b72efc76dbfb713 (patch) | |
| tree | 05abce06cd1151955b1f1280721044584012ee51 /libavformat | |
| parent | ca4d71b149ebe32aeaf617ffccf362624b9aafb1 (diff) | |
| parent | e955a682e125d44143415ff2b96a99a4dac78da2 (diff) | |
| download | ffmpeg-1889c6724a449b2e4826612d3b72efc76dbfb713.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
AVOptions: fix av_set_string3() doxy to match reality.
cmdutils: get rid of dummy contexts for examining AVOptions.
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
cpu detection: avoid a signed overflow
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
libavcodec/options.c
libavcodec/version.h
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 8 | ||||
| -rw-r--r-- | libavformat/options.c | 7 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e435881264..4315710e31 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1720,4 +1720,12 @@ int av_match_ext(const char *filename, const char *extensions); */ int avformat_query_codec(AVOutputFormat *ofmt, enum CodecID codec_id, int std_compliance); +/** + * Get the AVClass for AVFormatContext. It can be used in combination with + * AV_OPT_SEARCH_FAKE_OBJ for examining options. + * + * @see av_opt_find(). + */ +const AVClass *avformat_get_class(void); + #endif /* AVFORMAT_AVFORMAT_H */ diff --git a/libavformat/options.c b/libavformat/options.c index 957a72010b..65f1a4e639 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -38,7 +38,7 @@ static const AVOption *opt_find(void *obj, const char *name, const char *unit, i AVFormatContext *s = obj; AVInputFormat *ifmt = NULL; AVOutputFormat *ofmt = NULL; - if (s->priv_data) { + if (!(search_flags & AV_OPT_SEARCH_FAKE_OBJ) && s->priv_data) { if ((s->iformat && !s->iformat->priv_class) || (s->oformat && !s->oformat->priv_class)) return NULL; @@ -126,3 +126,8 @@ AVFormatContext *avformat_alloc_context(void) avformat_get_context_defaults(ic); return ic; } + +const AVClass *avformat_get_class(void) +{ + return &av_format_context_class; +} diff --git a/libavformat/version.h b/libavformat/version.h index 6d22be049e..d9e9f5c886 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -24,7 +24,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 53 -#define LIBAVFORMAT_VERSION_MINOR 10 +#define LIBAVFORMAT_VERSION_MINOR 11 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |