patched ffmpeg nov 2

patches/to_upstream/01_static_pthread_O2.patch

Index: patches/to_upstream/01_static_pthread_O2.patch
===================================================================
--- patches/to_upstream/01_static_pthread_O2.patch	(revision 65184)
+++ patches/to_upstream/01_static_pthread_O2.patch	(working copy)
@@ -1,7 +1,7 @@
-diff -rpu -N orig/configure ffmpeg-mt/configure
---- orig/configure	2010-10-11 16:53:56 -0700
-+++ ffmpeg-mt/configure	2010-10-11 16:53:59 -0700
-@@ -1840,7 +1840,7 @@ elif $cc -v 2>&1 | grep -qi ^gcc; then
+diff -wurp -N orig/configure ffmpeg-mt/configure
+--- orig/configure	2010-11-04 16:20:37 -0700
++++ ffmpeg-mt/configure	2010-11-04 16:20:45 -0700
+@@ -1845,7 +1845,7 @@ elif $cc -v 2>&1 | grep -qi ^gcc; then
          CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
          AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
      fi
@@ -10,7 +10,7 @@
      size_cflags='-Os'
  elif $cc --version 2>/dev/null | grep -q Intel; then
      cc_type=icc
-@@ -1990,6 +1990,7 @@ elif $cc -v 2>&1 | grep -q Open64; then
+@@ -1995,6 +1995,7 @@ elif $cc -v 2>&1 | grep -q Open64; then
      cc_ident=$($cc -v 2>&1 | head -n1 | tr -d :)
      CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
      AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@'
@@ -18,7 +18,7 @@
      speed_cflags='-O2'
      size_cflags='-Os'
  fi
-@@ -2709,6 +2710,10 @@ if ! disabled pthreads && ! enabled w32t
+@@ -2714,6 +2715,10 @@ if ! disabled pthreads && ! enabled w32t
          add_extralibs -pthreads
      elif check_func pthread_create -lpthreadGC2; then
          add_extralibs -lpthreadGC2
@@ -29,7 +29,7 @@
      elif ! check_lib pthread.h pthread_create -lpthread; then
          disable pthreads
      fi
-@@ -2937,7 +2942,8 @@ elif enabled ccc; then
+@@ -2942,7 +2947,8 @@ elif enabled ccc; then
  elif enabled gcc; then
      check_cflags -fno-tree-vectorize
      check_cflags -Werror=implicit-function-declaration
@@ -39,14 +39,15 @@
  elif enabled llvm_gcc; then
      check_cflags -mllvm -stack-alignment=16
  elif enabled clang; then
-diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
---- orig/libavcodec/allcodecs.c	2010-10-11 16:53:56 -0700
-+++ ffmpeg-mt/libavcodec/allcodecs.c	2010-10-11 16:53:59 -0700
-@@ -45,6 +45,14 @@
+diff -wurp -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
+--- orig/libavcodec/allcodecs.c	2010-11-04 16:20:37 -0700
++++ ffmpeg-mt/libavcodec/allcodecs.c	2010-11-04 16:16:41 -0700
+@@ -45,6 +45,15 @@
            extern AVBitStreamFilter x##_bsf; \
            if(CONFIG_##X##_BSF)     av_register_bitstream_filter(&x##_bsf); }
  
 +#ifdef PTW32_STATIC_LIB
++#include "pthread.h"
 +static void detach_ptw32(void)
 +{
 +    pthread_win32_thread_detach_np();
@@ -57,7 +58,7 @@
  void avcodec_register_all(void)
  {
      static int initialized;
-@@ -53,6 +61,11 @@ void avcodec_register_all(void)
+@@ -53,6 +62,11 @@ void avcodec_register_all(void)
          return;
      initialized = 1;
  
@@ -69,3 +70,19 @@
      /* hardware accelerators */
      REGISTER_HWACCEL (H263_VAAPI, h263_vaapi);
      REGISTER_HWACCEL (H264_DXVA2, h264_dxva2);
+@@ -391,6 +405,7 @@ void avcodec_register_all(void)
+     REGISTER_BSF     (CHOMP, chomp);
+     REGISTER_BSF     (DUMP_EXTRADATA, dump_extradata);
+     REGISTER_BSF     (H264_MP4TOANNEXB, h264_mp4toannexb);
++    REGISTER_BSF     (MPEG4VIDEO_ES, mpeg4video_es);
+     REGISTER_BSF     (IMX_DUMP_HEADER, imx_dump_header);
+     REGISTER_BSF     (MJPEGA_DUMP_HEADER, mjpega_dump_header);
+     REGISTER_BSF     (MP3_HEADER_COMPRESS, mp3_header_compress);
+@@ -399,5 +414,7 @@ void avcodec_register_all(void)
+     REGISTER_BSF     (NOISE, noise);
+     REGISTER_BSF     (REMOVE_EXTRADATA, remove_extradata);
+     REGISTER_BSF     (TEXT2MOVSUB, text2movsub);
++    REGISTER_BSF     (VC1_ASFTORCV, vc1_asftorcv);
++    REGISTER_BSF     (VC1_ASFTOANNEXG, vc1_asftoannexg);
+ }
+