[GNUnet-SVN] r7287 - Extractor/src/plugins/thumbnailffmpeg/ffmpeg/libavcodec

[gnunet]

Author: holindho
Date: 2008-06-20 12:43:24 -0600 (Fri, 20 Jun 2008)
New Revision: 7287

Modified:
   Extractor/src/plugins/thumbnailffmpeg/ffmpeg/libavcodec/utils.c
Log:
remove thread-safety alert


Modified: Extractor/src/plugins/thumbnailffmpeg/ffmpeg/libavcodec/utils.c
===================================================================
--- Extractor/src/plugins/thumbnailffmpeg/ffmpeg/libavcodec/utils.c     
2008-06-20 17:26:05 UTC (rev 7286)
+++ Extractor/src/plugins/thumbnailffmpeg/ffmpeg/libavcodec/utils.c     
2008-06-20 18:43:24 UTC (rev 7287)
@@ -57,8 +57,6 @@
 
0x0F,0x8F,0x4F,0xCF,0x2F,0xAF,0x6F,0xEF,0x1F,0x9F,0x5F,0xDF,0x3F,0xBF,0x7F,0xFF,
 };
 
-static int volatile entangled_thread_counter=0;
-
 void *av_fast_realloc(void *ptr, unsigned int *size, unsigned int min_size)
 {
     if(min_size < *size)
@@ -793,12 +791,6 @@
 {
     int ret= -1;
 
-    entangled_thread_counter++;
-    if(entangled_thread_counter != 1){
-        av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around 
avcodec_open/close()\n");
-        goto end;
-    }
-
     if(avctx->codec || !codec)
         goto end;
 
@@ -836,7 +828,6 @@
     }
     ret=0;
 end:
-    entangled_thread_counter--;
     return ret;
 }
 
@@ -959,13 +950,6 @@
 
 int avcodec_close(AVCodecContext *avctx)
 {
-    entangled_thread_counter++;
-    if(entangled_thread_counter != 1){
-        av_log(avctx, AV_LOG_ERROR, "insufficient thread locking around 
avcodec_open/close()\n");
-        entangled_thread_counter--;
-        return -1;
-    }
-
     if (ENABLE_THREADS && avctx->thread_opaque)
         avcodec_thread_free(avctx);
     if (avctx->codec->close)
@@ -973,7 +957,6 @@
     avcodec_default_free_buffers(avctx);
     av_freep(&avctx->priv_data);
     avctx->codec = NULL;
-    entangled_thread_counter--;
     return 0;
 }