Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 0 insertions, 1 deletions

diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h
index 66e7696466..3bb0b37016 100644
--- a/libavcodec/sipr.h
+++ b/libavcodec/sipr.h
@@ -55,7 +55,6 @@ typedef enum {
 
 typedef struct {
     AVCodecContext *avctx;
-    DSPContext dsp;
 
     SiprMode mode;