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

Side by Side Diff: third_party/ffmpeg/include/libavutil/fifo.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 * This file is part of FFmpeg. 2 * This file is part of FFmpeg.
3 * 3 *
4 * FFmpeg is free software; you can redistribute it and/or 4 * FFmpeg is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public 5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2.1 of the License, or (at your option) any later version. 7 * version 2.1 of the License, or (at your option) any later version.
8 * 8 *
9 * FFmpeg is distributed in the hope that it will be useful, 9 * FFmpeg is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void av_fifo_drain(AVFifoBuffer *f, int size); 108 void av_fifo_drain(AVFifoBuffer *f, int size);
109 109
110 static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs) 110 static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
111 { 111 {
112 uint8_t *ptr = f->rptr + offs; 112 uint8_t *ptr = f->rptr + offs;
113 if (ptr >= f->end) 113 if (ptr >= f->end)
114 ptr -= f->end - f->buffer; 114 ptr -= f->end - f->buffer;
115 return *ptr; 115 return *ptr;
116 } 116 }
117 #endif /* AVUTIL_FIFO_H */ 117 #endif /* AVUTIL_FIFO_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavutil/crc.h ('k') | third_party/ffmpeg/include/libavutil/intfloat_readwrite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698