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

index 152afb3..d2ae1ea 100644 (file)
@@ -179,7 +179,7 @@ Follows a BNF description for the filtergraph syntax:
 @var{LINKLABEL}        ::= "[" @var{NAME} "]"
 @var{LINKLABELS}       ::= @var{LINKLABEL} [@var{LINKLABELS}]
 @var{FILTER_ARGUMENTS} ::= sequence of chars (eventually quoted)
-@var{FILTER}           ::= [@var{LINKNAMES}] @var{NAME} ["=" @var{ARGUMENTS}] [@var{LINKNAMES}]
+@var{FILTER}           ::= [@var{LINKLABELS}] @var{NAME} ["=" @var{FILTER_ARGUMENTS}] [@var{LINKLABELS}]
 @var{FILTERCHAIN}      ::= @var{FILTER} [,@var{FILTERCHAIN}]
 @var{FILTERGRAPH}      ::= [sws_flags=@var{flags};] @var{FILTERCHAIN} [;@var{FILTERGRAPH}]
 @end example
index 709f83d..ddaa120 100644 (file)
 #ifndef AVCODEC_ARM_VP8_H
 #define AVCODEC_ARM_VP8_H
 
+#include <stdint.h>
+
 #include "config.h"
+#include "libavcodec/vp56.h"
+#include "libavcodec/vp8.h"
 
 #if HAVE_ARMV6_EXTERNAL
 #define decode_block_coeffs_internal ff_decode_block_coeffs_armv6
index 7d27ca5..9620eda 100644 (file)
@@ -29,8 +29,8 @@
  * Public libavcodec DXVA2 header.
  */
 
+#define _WIN32_WINNT 0x0600
 #include <stdint.h>
-
 #include <d3d9.h>
 #include <dxva2api.h>