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)
commit42d3fea65f787eed356c47336c240edb7b0c879d
tree5d7f8da372ac4e8dbc4c19b01e0500baa15d2312
parent264441715b132344e15f27f6a5740645d5146f56
parentaf7d13ee4a4bf8d708f9b0598abb8f6e22b76de1
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>
libavcodec/x86/h264_idct.asm
libavfilter/asink_anullsink.c
libavutil/x86/cpu.c