Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Nov 2012 12:32:09 +0000 (13:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 Nov 2012 12:32:17 +0000 (13:32 +0100)
* 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>
1  2 
libavcodec/x86/h264_idct.asm
libavfilter/asink_anullsink.c
libavutil/x86/cpu.c

Simple merge
Simple merge
Simple merge