summaryrefslogtreecommitdiff
path: root/libavutil/opt.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-06-06 03:02:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-06-06 03:33:58 +0200
commitf9569249c274ab71b570d6a462903379e9d414fb (patch)
tree0b8f8c4930874a5115f6608a23b55eb2f5be1c34 /libavutil/opt.h
parent6700aa8810d877cb017d977f12638481df459eb1 (diff)
parenteb7505e4295dca9c3ab8c01e055a458e07857ef0 (diff)
Merge remote-tracking branch 'qatar/master'
* qatar/master: Remove some unused scripts from tools/. Add x86 assembly for some 10-bit H.264 intra predict functions. v4l2: do not force NTSC as standard Skip tableprint.h during 'make checkheaders'. Remove unnecessary LIBAVFORMAT_BUILD #ifdef. Drop explicit filenames from @file Doxygen tags. Skip generated table headers during 'make checkheaders'. lavf,lavc: free avoptions in a generic way. AVOptions: add av_opt_free convenience function. tableprint: Restore mistakenly deleted common.h #include for FF_ARRAY_ELEMS. tiff: print log in case of unknown / unsupported tag. tiff: fix linesize for mono-white/black formats. Fix build of eval-test program configure: Document --enable-vaapi ac3enc: extract all exponents for the frame at once Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
-rw-r--r--libavutil/opt.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h
index b04c7905d6..c967ed5c6b 100644
--- a/libavutil/opt.h
+++ b/libavutil/opt.h
@@ -176,4 +176,9 @@ void av_opt_set_defaults2(void *s, int mask, int flags);
int av_set_options_string(void *ctx, const char *opts,
const char *key_val_sep, const char *pairs_sep);
+/**
+ * Free all string and binary options in obj.
+ */
+void av_opt_free(void *obj);
+
#endif /* AVUTIL_OPT_H */