Cleanup: remove C++ checking

These are C++ files. The checking is unnecessary.

diff --git a/utils/codec_utils.cpp b/utils/codec_utils.cpp
index 24793b3..5275b10 100644 (file)
--- a/utils/codec_utils.cpp
+++ b/utils/codec_utils.cpp
@@ -17,17 +17,13 @@
 #define LOG_TAG "codec_utils"
 #include <utils/Log.h>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #include "config.h"
 #include "libavcodec/xiph.h"
 #include "libavutil/intreadwrite.h"
 
-#ifdef __cplusplus
 }
-#endif
 
 #include <utils/Errors.h>
 #include <media/stagefright/foundation/ABitReader.h>

diff --git a/utils/ffmpeg_source.cpp b/utils/ffmpeg_source.cpp
index df82ddc..e0a4ce5 100644 (file)
--- a/utils/ffmpeg_source.cpp
+++ b/utils/ffmpeg_source.cpp
@@ -22,16 +22,12 @@
 
 #include <media/stagefright/DataSource.h>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #include "config.h"
 #include "libavformat/url.h"
 
-#ifdef __cplusplus
 }
-#endif
 
 namespace android {
 

diff --git a/utils/ffmpeg_utils.cpp b/utils/ffmpeg_utils.cpp
index 60d232e..5f17a70 100644 (file)
--- a/utils/ffmpeg_utils.cpp
+++ b/utils/ffmpeg_utils.cpp
@@ -20,9 +20,7 @@
 
 #include <utils/Errors.h>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #include "config.h"
 
@@ -36,9 +34,7 @@ extern "C" {
 #undef strncpy
 #include <string.h>
 
-#ifdef __cplusplus
 }
-#endif
 
 #include <cutils/properties.h>
 

diff --git a/utils/ffmpeg_utils.h b/utils/ffmpeg_utils.h
index 4524c03..0462856 100644 (file)
--- a/utils/ffmpeg_utils.h
+++ b/utils/ffmpeg_utils.h
@@ -26,9 +26,7 @@
 #include <utils/Errors.h>
 #include <utils/Mutex.h>
 
-#ifdef __cplusplus
 extern "C" {
-#endif
 
 #include "config.h"
 #include "libavformat/avformat.h"
@@ -58,9 +56,7 @@ extern "C" {
 
 #include <system/audio.h>
 
-#ifdef __cplusplus
 }
-#endif
 
 //XXX hack!!!
 #define SF_NOPTS_VALUE ((uint64_t)AV_NOPTS_VALUE-1)