From b5ad422bf4e671a8b30ce73ad236cd6b49940af9 Mon Sep 17 00:00:00 2001 From: Vicente Jimenez Aguilar Date: Wed, 20 Feb 2013 02:35:00 +0100 Subject: [PATCH 1/3] doc: filters: Correct BNF FILTER description Signed-off-by: Diego Biurrun --- doc/filters.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 2bd013de6f..a7d6a56d41 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -90,7 +90,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 From 3e85b46ecf3c3264e68e37b57ddda2279b373ec3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 20 Feb 2013 11:09:38 +0100 Subject: [PATCH 2/3] arm: vp8: Add missing #includes for header to compile standalone --- libavcodec/arm/vp8.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h index 9cc60108e8..cd3428bea2 100644 --- a/libavcodec/arm/vp8.h +++ b/libavcodec/arm/vp8.h @@ -19,7 +19,11 @@ #ifndef AVCODEC_ARM_VP8_H #define AVCODEC_ARM_VP8_H +#include + #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 From a0a1ac0f091d390cbbb73c90e1b6a4a18cf0f50a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 11 Feb 2013 17:59:07 +0100 Subject: [PATCH 3/3] dxva2: Add missing #define to make header compile standalone --- libavcodec/dxva2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h index c06f1f3332..d161eb9f5e 100644 --- a/libavcodec/dxva2.h +++ b/libavcodec/dxva2.h @@ -29,8 +29,8 @@ * Public libavcodec DXVA2 header. */ +#define _WIN32_WINNT 0x0600 #include - #include #include