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)
* 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>
1  2 
doc/filters.texi
libavcodec/arm/vp8.h
libavcodec/dxva2.h

Simple merge
Simple merge
Simple merge