Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master: Remove a superfluous include from libavcodec/options_table.h. Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 0b5f4fdc38
parent e215cb5e96 76f43cbe26
commit 0b5f4fdc38
1 changed files with 0 additions and 1 deletions
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@ -28,7 +28,6 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "version.h"
-#include "config.h"

 #define OFFSET(x) offsetof(AVCodecContext,x)
 #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C