summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-19 18:29:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-19 22:03:27 +0100
commitd5d29ae3b0375320a7a34f85a5a90e8362550dbb (patch)
tree233817ceb5d6003890e65a142bc485fadc01f608
parentef7f7516426ebf4fdb28420925f52ada61457598 (diff)
parent57f13fd7e993ee0b582695c7af7a6bdf1c7d0761 (diff)
downloadffmpeg-d5d29ae3b0375320a7a34f85a5a90e8362550dbb.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: dv_tablegen: Remove CONFIG_SMALL preprocessor check Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dv_tablegen.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/dv_tablegen.c b/libavcodec/dv_tablegen.c
index 5d3793e11d..257934101a 100644
--- a/libavcodec/dv_tablegen.c
+++ b/libavcodec/dv_tablegen.c
@@ -22,9 +22,6 @@
#include <stdlib.h>
#define CONFIG_HARDCODED_TABLES 0
-#ifndef CONFIG_SMALL
-#error CONFIG_SMALL must be defined to generate tables
-#endif
#include "dv_tablegen.h"
#include "tableprint.h"
#include <inttypes.h>