Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: third_party/ffmpeg/include/libavcodec/opt.h

Issue 854006: Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 /* 1 /*
2 * AVOptions 2 * AVOptions
3 * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at> 3 * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 double av_get_double(void *obj, const char *name, const AVOption **o_out); 147 double av_get_double(void *obj, const char *name, const AVOption **o_out);
148 AVRational av_get_q(void *obj, const char *name, const AVOption **o_out); 148 AVRational av_get_q(void *obj, const char *name, const AVOption **o_out);
149 int64_t av_get_int(void *obj, const char *name, const AVOption **o_out); 149 int64_t av_get_int(void *obj, const char *name, const AVOption **o_out);
150 const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c har *buf, int buf_len); 150 const char *av_get_string(void *obj, const char *name, const AVOption **o_out, c har *buf, int buf_len);
151 const AVOption *av_next_option(void *obj, const AVOption *last); 151 const AVOption *av_next_option(void *obj, const AVOption *last);
152 int av_opt_show(void *obj, void *av_log_obj); 152 int av_opt_show(void *obj, void *av_log_obj);
153 void av_opt_set_defaults(void *s); 153 void av_opt_set_defaults(void *s);
154 void av_opt_set_defaults2(void *s, int mask, int flags); 154 void av_opt_set_defaults2(void *s, int mask, int flags);
155 155
156 #endif /* AVCODEC_OPT_H */ 156 #endif /* AVCODEC_OPT_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavcodec/avcodec.h ('k') | third_party/ffmpeg/include/libavcodec/vdpau.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698