diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-01-12 21:56:02 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-01-12 23:08:23 +0100 |
| commit | 55b9ef18e4a139fc24a3b695cb3c176f3ced09b8 (patch) | |
| tree | 8bf5602225fd9201124d905f83a03ec4b4d45ca5 /libavcodec/h264_cabac.c | |
| parent | 0a60780c7fe72e2f9cc41efc152b3807954b7820 (diff) | |
| download | ffmpeg-55b9ef18e4a139fc24a3b695cb3c176f3ced09b8.tar.gz | |
cabac: split cabac.h into declarations and function definitions
This fixes standalone compilation of some decoders with --disable-optimizations.
cabac.h defines some inline functions that use symbols from cabac.c. Without
optimizations these inline functions are not eliminated and linking fails with
references to non-existing symbols.
Splitting the inline functions off into their own header and only #including
it in the places where the inline functions are used allows #including cabac.h
from anywhere without ill effects.
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index feadf49364..a49ac6d498 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -27,6 +27,9 @@ #define CABAC 1 +#include "config.h" +#include "cabac.h" +#include "cabac_functions.h" #include "internal.h" #include "dsputil.h" #include "avcodec.h" @@ -35,7 +38,6 @@ #include "h264_mvpred.h" #include "golomb.h" -#include "cabac.h" #if ARCH_X86 #include "x86/h264_i386.h" #endif |