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

Side by Side Diff: third_party/ffmpeg/include/libavutil/base64.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 * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com) 2 * Copyright (c) 2006 Ryan Martell. (rdm4@martellventures.com)
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 29 matching lines...) Expand all
40 * 40 *
41 * @param out_size size in bytes of the \p out string, it should be at 41 * @param out_size size in bytes of the \p out string, it should be at
42 * least ((\p in_size + 2) / 3) * 4 + 1 42 * least ((\p in_size + 2) / 3) * 4 + 1
43 * @param in_size size in bytes of the \p in buffer 43 * @param in_size size in bytes of the \p in buffer
44 * @return the string containing the encoded data, or NULL in case of 44 * @return the string containing the encoded data, or NULL in case of
45 * error 45 * error
46 */ 46 */
47 char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size); 47 char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size);
48 48
49 #endif /* AVUTIL_BASE64_H */ 49 #endif /* AVUTIL_BASE64_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavutil/avutil.h ('k') | third_party/ffmpeg/include/libavutil/common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698