remove the useless code

diff --git a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
index 7a060ca..10b5d01 100644 (file)
--- a/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
+++ b/libstagefright/FFmpegExtractor/FFmpegExtractor.cpp
@@ -323,25 +323,6 @@ int FFmpegExtractor::packet_queue_get(PacketQueue *q, AVPacket *pkt, int block)
     return ret;
 }
 
-static int lockmgr(void **mtx, enum AVLockOp op)
-{
-   switch(op) {
-      case AV_LOCK_CREATE:
-          *mtx = (void *)SDL_CreateMutex();
-          if(!*mtx)
-              return 1;
-          return 0;
-      case AV_LOCK_OBTAIN:
-          return !!SDL_LockMutex((SDL_mutex *)*mtx);
-      case AV_LOCK_RELEASE:
-          return !!SDL_UnlockMutex((SDL_mutex *)*mtx);
-      case AV_LOCK_DESTROY:
-          SDL_DestroyMutex((SDL_mutex *)*mtx);
-          return 0;
-   }
-   return 1;
-}
-
 static void EncodeSize14(uint8_t **_ptr, size_t size) {
     CHECK_LE(size, 0x3fff);
 

diff --git a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
index 6d2423d..f70768f 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
+++ b/libstagefright/codecs/ffmpegdec/adec/SoftFFmpegAudio.cpp
@@ -170,24 +170,6 @@ void SoftFFmpegAudio::initPorts() {
     addPort(def);
 }
 
-static int lockmgr(void **mtx, enum AVLockOp op) {
-   switch(op) {
-      case AV_LOCK_CREATE:
-          *mtx = (void *)SDL_CreateMutex();
-          if(!*mtx)
-              return 1;
-          return 0;
-      case AV_LOCK_OBTAIN:
-          return !!SDL_LockMutex((SDL_mutex *)*mtx);
-      case AV_LOCK_RELEASE:
-          return !!SDL_UnlockMutex((SDL_mutex *)*mtx);
-      case AV_LOCK_DESTROY:
-          SDL_DestroyMutex((SDL_mutex *)*mtx);
-          return 0;
-   }
-   return 1;
-}
-
 void SoftFFmpegAudio::setAVCtxToDefault(AVCodecContext *avctx, const AVCodec *codec) {
     int fast = 0;
 

diff --git a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
index 84ad5c0..969ed43 100644 (file)
--- a/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
+++ b/libstagefright/codecs/ffmpegdec/vdec/SoftFFmpegVideo.cpp
@@ -183,24 +183,6 @@ void SoftFFmpegVideo::initPorts() {
     addPort(def);
 }
 
-static int lockmgr(void **mtx, enum AVLockOp op) {
-   switch(op) {
-      case AV_LOCK_CREATE:
-          *mtx = (void *)SDL_CreateMutex();
-          if(!*mtx)
-              return 1;
-          return 0;
-      case AV_LOCK_OBTAIN:
-          return !!SDL_LockMutex((SDL_mutex *)*mtx);
-      case AV_LOCK_RELEASE:
-          return !!SDL_UnlockMutex((SDL_mutex *)*mtx);
-      case AV_LOCK_DESTROY:
-          SDL_DestroyMutex((SDL_mutex *)*mtx);
-          return 0;
-   }
-   return 1;
-}
-
 void SoftFFmpegVideo::setAVCtxToDefault(AVCodecContext *avctx, const AVCodec *codec) {
     int fast = 0;