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

Side by Side Diff: third_party/ffmpeg/ffmpeg_stub_headers.fragment

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. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/ffmpeg/ffmpeg.gyp ('k') | third_party/ffmpeg/include/libavcodec/avcodec.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // These are some extra includes needed in the generated stub file for defining 1 // These are some extra includes needed in the generated stub file for defining
2 // various FFmpeg types. 2 // various FFmpeg types.
3 3
4 extern "C" { 4 extern "C" {
5 5
6 #include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avcodec.h" 6 #include "third_party/ffmpeg/include/libavcodec/avcodec.h"
7 #include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avformat.h" 7 #include "third_party/ffmpeg/include/libavformat/avformat.h"
8
9 typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
10 8
11 } 9 }
OLDNEW
« no previous file with comments | « third_party/ffmpeg/ffmpeg.gyp ('k') | third_party/ffmpeg/include/libavcodec/avcodec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698