summaryrefslogtreecommitdiff
path: root/libavcodec/aacenc.c
diff options
context:
space:
mode:
authorRostislav Pehlivanov <atomnuker@gmail.com>2015-07-29 05:44:27 +0100
committerClaudio Freire <klaussfreire@gmail.com>2015-08-11 00:22:05 -0300
commitef8e5a61c85d54139c624468bc6e11fbb55bfbbf (patch)
tree75a379c1f2493ad85990fcf54ea1739b4c967a06 /libavcodec/aacenc.c
parent8623aba043689c024d6b03e2c794137920265c8f (diff)
aacenc: Move small misc. functions to a separate file
As well as tables littered everywhere, functions were spread out all across the encoder's files. This moves them to a single place where they can be used by either the encoder's main files or additional encoder files. Additionally, it changes the type of some to 'inline' to enable us to simply put them in a header file and possibly gain some speed due to compiler optimizations. Signed-off-by: Claudio Freire <klaussfreire@gmail.com>
Diffstat (limited to 'libavcodec/aacenc.c')
-rw-r--r--libavcodec/aacenc.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index febd661484..d87a90c7a0 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -43,20 +43,10 @@
#include "aactab.h"
#include "aacenc.h"
#include "aacenctab.h"
+#include "aacenc_utils.h"
#include "psymodel.h"
-#define ERROR_IF(cond, ...) \
- if (cond) { \
- av_log(avctx, AV_LOG_ERROR, __VA_ARGS__); \
- return AVERROR(EINVAL); \
- }
-
-#define WARN_IF(cond, ...) \
- if (cond) { \
- av_log(avctx, AV_LOG_WARNING, __VA_ARGS__); \
- }
-
/**
* Make AAC audio config object.
* @see 1.6.2.1 "Syntax - AudioSpecificConfig"