Chromium Code Reviews

Side by Side Diff: third_party/ffmpeg/include/libavformat/avformat.h

Issue 1240002: Revert 42415 - 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.
Jump to:
View unified diff | | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 /* 1 /*
2 * copyright (c) 2001 Fabrice Bellard 2 * copyright (c) 2001 Fabrice Bellard
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 1218 matching lines...)
1229 char *hostname, int hostname_size, 1229 char *hostname, int hostname_size,
1230 int *port_ptr, 1230 int *port_ptr,
1231 char *path, int path_size, 1231 char *path, int path_size,
1232 const char *url); 1232 const char *url);
1233 1233
1234 int match_ext(const char *filename, const char *extensions); 1234 int match_ext(const char *filename, const char *extensions);
1235 1235
1236 #endif /* HAVE_AV_CONFIG_H */ 1236 #endif /* HAVE_AV_CONFIG_H */
1237 1237
1238 #endif /* AVFORMAT_AVFORMAT_H */ 1238 #endif /* AVFORMAT_AVFORMAT_H */
OLDNEW
« no previous file with comments | « third_party/ffmpeg/include/libavcodec/xvmc.h ('k') | third_party/ffmpeg/include/libavformat/avio.h » ('j') | no next file with comments »

Powered by Google App Engine