revert bad checkin

[ffmpeg] / libavcodec / os2thread.c

diff --git a/libavcodec/os2thread.c b/libavcodec/os2thread.c
index 252396583b061e9044780d4a09b279ea611d2c0d..c52b7ae02e38840659eaeaf745e122061b0ca286 100644 (file)
--- a/libavcodec/os2thread.c
+++ b/libavcodec/os2thread.c
@@ -1,18 +1,20 @@
 /*
  * Copyright (c) 2004 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
@@ -23,8 +25,6 @@
 #include "avcodec.h"
 #include "common.h"
 
-#ifdef HAVE_THREADS
-
 #define INCL_DOS
 #define INCL_DOSERRORS
 #define INCL_DOSDEVIOCTL
@@ -145,4 +145,3 @@ fail:
     avcodec_thread_free(s);
     return -1;
 }
-#endif