• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 56e11d23
    Michael Niedermayer authored
    
    
    * qatar/master:
      Drop git- prefix from version labels
      Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
      path64/open64: filter out unsupported flags
      Add Release Notes
      sipr: Drop unused DSPContext
      sipr: include string.h for mem*()
      sipr: Use memmove() to copy overlapped buffers.
      h264: drop some ugly casts
    
    Conflicts:
    	version.sh
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    56e11d23