diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 12:24:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 12:43:08 +0200 |
| commit | 0b5f4fdc381fefa96b99c729a5ef65458e7aa32c (patch) | |
| tree | 180460a51d616729563bd6b638b50779f267a0de /libavcodec | |
| parent | e215cb5e9670f8149d8486ddc9f09277fc0ba8cc (diff) | |
| parent | 76f43cbe2648ac5cb0e5a146f7e843310002199a (diff) | |
| download | ffmpeg-0b5f4fdc381fefa96b99c729a5ef65458e7aa32c.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Remove a superfluous include from libavcodec/options_table.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/options_table.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 1be261123c..4fd6cff0c7 100644 --- 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 |