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

Side by Side Diff: third_party/ffmpeg/include/libavutil/adler32.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 Mans Rullgard 2 * copyright (c) 2006 Mans Rullgard
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 10 matching lines...) Expand all
21 #ifndef AVUTIL_ADLER32_H 21 #ifndef AVUTIL_ADLER32_H
22 #define AVUTIL_ADLER32_H 22 #define AVUTIL_ADLER32_H
23 23
24 #include <stdint.h> 24 #include <stdint.h>
25 #include "common.h" 25 #include "common.h"
26 26
27 unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, 27 unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
28 unsigned int len) av_pure; 28 unsigned int len) av_pure;
29 29
30 #endif /* AVUTIL_ADLER32_H */ 30 #endif /* AVUTIL_ADLER32_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavformat/avio.h ('k') | third_party/ffmpeg/include/libavutil/avstring.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698