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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/test_data_util.cc

Issue 8718014: Upstream: Media implementation for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« media/base/media_android.cc ('K') | « media/base/media_android.cc ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/test_data_util.cc
diff --git a/media/base/test_data_util.cc b/media/base/test_data_util.cc
index 45a37351703ee8507958c94f52246bd700537bb4..15c95a338bf6882356284fc3e331ec89c0fab525 100644
--- a/media/base/test_data_util.cc
+++ b/media/base/test_data_util.cc
@@ -7,7 +7,12 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
+
+#if !defined(OS_ANDROID)
#include "media/ffmpeg/ffmpeg_common.h"
+#else
+#define FF_INPUT_BUFFER_PADDING_SIZE 16
+#endif
namespace media {
« media/base/media_android.cc ('K') | « media/base/media_android.cc ('k') | media/media.gyp » ('j') | media/media.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698