summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/opt.h
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2007-01-28 18:38:32 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2007-01-28 18:38:32 +0000
commit7c3728d769962d288b73cc945c3143ae68726984 (patch)
tree36f762f4ce762a77ed0333711f628c40ba1a0f98 /src/libffmpeg/libavcodec/opt.h
parent9add5e858c10b369eb44fe7ab618efb37eb3c585 (diff)
downloadxine-lib-7c3728d769962d288b73cc945c3143ae68726984.tar.gz
xine-lib-7c3728d769962d288b73cc945c3143ae68726984.tar.bz2
another ffmpeg sync to include h264 security fixes
CVS patchset: 8573 CVS date: 2007/01/28 18:38:32
Diffstat (limited to 'src/libffmpeg/libavcodec/opt.h')
-rw-r--r--src/libffmpeg/libavcodec/opt.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libffmpeg/libavcodec/opt.h b/src/libffmpeg/libavcodec/opt.h
index b8a17031b..ff65456d8 100644
--- a/src/libffmpeg/libavcodec/opt.h
+++ b/src/libffmpeg/libavcodec/opt.h
@@ -68,15 +68,15 @@ typedef struct AVOption {
} AVOption;
-AVOption *av_set_string(void *obj, const char *name, const char *val);
-AVOption *av_set_double(void *obj, const char *name, double n);
-AVOption *av_set_q(void *obj, const char *name, AVRational n);
-AVOption *av_set_int(void *obj, const char *name, int64_t n);
-double av_get_double(void *obj, const char *name, AVOption **o_out);
-AVRational av_get_q(void *obj, const char *name, AVOption **o_out);
-int64_t av_get_int(void *obj, const char *name, AVOption **o_out);
-const char *av_get_string(void *obj, const char *name, AVOption **o_out, char *buf, int buf_len);
-AVOption *av_next_option(void *obj, AVOption *last);
+const AVOption *av_set_string(void *obj, const char *name, const char *val);
+const AVOption *av_set_double(void *obj, const char *name, double n);
+const AVOption *av_set_q(void *obj, const char *name, AVRational n);
+const AVOption *av_set_int(void *obj, const char *name, int64_t n);
+double av_get_double(void *obj, const char *name, const AVOption **o_out);
+AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
+int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
+const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len);
+const AVOption *av_next_option(void *obj, const AVOption *last);
int av_opt_show(void *obj, void *av_log_obj);
void av_opt_set_defaults(void *s);