Ticket #41152: patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff

File patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff, 1.2 KB (added by crazyhorse671@…, 11 years ago)

source file patch

  • libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp

    old new  
    5656    signed char analyze(AnalysisResult& idx, ::InputStream* in);
    5757};
    5858
    59 STRIGI_MUTEX_DEFINE(mutex);
     59STRIGI_MUTEX_DEFINE(strigi_mutex);
    6060
    6161static int
    6262lockmgr(void **mtx, enum AVLockOp op) {
    6363  // pre-allocating a single mutex is the only way to get it to work without changing strigi_thread.h
    64   assert( (*mtx == &mutex) || (op == AV_LOCK_CREATE) );
     64  assert( (*mtx == &strigi_mutex) || (op == AV_LOCK_CREATE) );
    6565  switch(op) {
    6666  case AV_LOCK_CREATE:
    67     *mtx = &mutex;
    68     return !!STRIGI_MUTEX_INIT(&mutex);
     67    *mtx = &strigi_mutex;
     68    return !!STRIGI_MUTEX_INIT(&strigi_mutex);
    6969  case AV_LOCK_OBTAIN:
    70     return !!STRIGI_MUTEX_LOCK(&mutex);
     70    return !!STRIGI_MUTEX_LOCK(&strigi_mutex);
    7171  case AV_LOCK_RELEASE:
    72     return !!STRIGI_MUTEX_UNLOCK(&mutex);
     72    return !!STRIGI_MUTEX_UNLOCK(&strigi_mutex);
    7373  case AV_LOCK_DESTROY:
    74     STRIGI_MUTEX_DESTROY(&mutex);
     74    STRIGI_MUTEX_DESTROY(&strigi_mutex);
    7575    return 0;
    7676  }
    7777  return 1;