Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: K&R cosmetics
  doxygen: remove unreplaced variables from custom header and footer
  threads: test for sys/param.h and include it for sysctl on OpenBSD
  v4l2: remove unneded linux specific asm/types.h include
  x86: Fix constraints for decode_significance*_x86

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

configure

@@ -1228,6 +1228,7 @@ HAVE_LIST="
     symver_gnu_asm
     sysctl
     sys_mman_h
+    sys_param_h
     sys_resource_h
     sys_select_h
     sys_soundcard_h
@@ -3020,6 +3021,7 @@ check_header libcrystalhd/libcrystalhd_if.h
 check_header malloc.h
 check_header poll.h
 check_header sys/mman.h
+check_header sys/param.h
 check_header sys/resource.h
 check_header sys/select.h
 check_header termios.h

doc/doxy/footer.html

  </div>
 
  <div id="footer">
- <!--BEGIN GENERATE_TREEVIEW-->
-     <li class="footer">$generatedby
-     <a href="http://www.doxygen.org/index.html">
-     <img class="footer" src="doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
-    </ul>
- <!--END GENERATE_TREEVIEW-->
- <!--BEGIN !GENERATE_TREEVIEW-->
- <address class="footer"><small>
- $generatedby &#160;<a href="http://www.doxygen.org/index.html">
- <img class="footer" src="$relpath$doxygen.png" alt="doxygen"/>
- </a> $doxygenversion
- </small></address>
- <!--END !GENERATE_TREEVIEW-->
+   Generated on $datetime for $projectname by&#160;<a href="http://www.doxygen.org/index.html">doxygen</a> $doxygenversion
  </div>
 
 </div>

doc/doxy/header.html

@@ -6,9 +6,6 @@
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
 <link href="$relpath$doxy_stylesheet.css" rel="stylesheet" type="text/css" />
-$treeview
-$search
-$mathjax
 </head>
 
 <div id="container">

libavcodec/h264_cabac.c

@@ -1657,7 +1657,7 @@ decode_cabac_residual_internal(H264Context *h, DCTELEM *block,
             index[coeff_count++] = last;\
         }
         const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD];
-#if ARCH_X86 && HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)
+#if ARCH_X86 && HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
         coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index,
                                                  last_coeff_ctx_base, sig_off);
     } else {

libavcodec/pthread.c

@@ -37,6 +37,9 @@
 #elif HAVE_GETSYSTEMINFO
 #include <windows.h>
 #elif HAVE_SYSCTL
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>

libavcodec/x86/h264_i386.h

@@ -36,7 +36,7 @@
 
 //FIXME use some macros to avoid duplicating get_cabac (cannot be done yet
 //as that would make optimization work hard)
-#if HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS)
+#if HAVE_7REGS && !defined(BROKEN_RELOCATIONS)
 static int decode_significance_x86(CABACContext *c, int max_coeff,
                                    uint8_t *significant_coeff_ctx_base,
                                    int *index, x86_reg last_off){
@@ -144,6 +144,6 @@ static int decode_significance_8x8_x86(CABACContext *c,
     );
     return coeff_count;
 }
-#endif /* HAVE_EBX_AVAILABLE && !defined(BROKEN_RELOCATIONS) */
+#endif /* HAVE_7REGS && !defined(BROKEN_RELOCATIONS) */
 
 #endif /* AVCODEC_X86_H264_I386_H */