Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Feb 2013 11:59:30 +0000 (12:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Feb 2013 11:59:38 +0000 (12:59 +0100)
commit6b8f21190d5a01ee68103f77ccef59c709c7d75e
tree18012c9eacd646d49ef43796ab7d35fbfff01f5d
parent9fa5a47197c6ef5489b04470b8369da33db40824
parenta0a1ac0f091d390cbbb73c90e1b6a4a18cf0f50a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxva2: Add missing #define to make header compile standalone
  arm: vp8: Add missing #includes for header to compile standalone
  doc: filters: Correct BNF FILTER description

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavcodec/arm/vp8.h
libavcodec/dxva2.h