Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'

* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
  asink_nullsink: plug a memory leak.
  x86: h264_idct: port to cpuflags
  x86: cpu: Drop unused HAVE_RWEFLAGS condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/x86/h264_idct.asm
Simple merge

diff --cc libavfilter/asink_anullsink.c
Simple merge

diff --cc libavutil/x86/cpu.c
Simple merge