• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0e5fbbd7
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0e5fbbd7
h264_cabac.c 112 KB