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

Unified Diff: third_party/ffmpeg/ffmpeg_stub_headers.fragment

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/ffmpeg/ffmpeg.gyp ('k') | third_party/ffmpeg/include/libavcodec/avcodec.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/ffmpeg/ffmpeg_stub_headers.fragment
===================================================================
--- third_party/ffmpeg/ffmpeg_stub_headers.fragment (revision 41387)
+++ third_party/ffmpeg/ffmpeg_stub_headers.fragment (working copy)
@@ -3,9 +3,7 @@
extern "C" {
-#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavcodec/avcodec.h"
-#include "third_party/ffmpeg/source/patched-ffmpeg-mt/libavformat/avformat.h"
+#include "third_party/ffmpeg/include/libavcodec/avcodec.h"
+#include "third_party/ffmpeg/include/libavformat/avformat.h"
-typedef int (*AVLockMgrOperation)(void**, enum AVLockOp);
-
}
« 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