diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-07-12 08:15:55 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-07-12 08:15:55 -0700 |
| commit | c90a2538a0bb4937cdecb852fadc3f98899624a9 (patch) | |
| tree | ca1d18ba5eef510b6dc87bf8674acbe8f8ca8c9c /libavcodec/h264.h | |
| parent | e59d6b4d7255d6d3dc89580f534e18af1433fe25 (diff) | |
| download | ffmpeg-c90a2538a0bb4937cdecb852fadc3f98899624a9.tar.gz | |
h264: move h264_mvpred.h include.
Fixes the following compile error with darwin/gcc-4.2.1:
In file included from libavcodec/error_resilience.c:33:
libavcodec/h264.h: In function ‘decode_mb_skip’:
libavcodec/h264.h:773: error: ‘always_inline’ function could not be inlined in call to ‘pred_pskip_motion’: the function body must appear before caller
libavcodec/h264.h:1334: error: called from here
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index f5bdb667b9..9d46ab479a 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -770,7 +770,7 @@ static av_always_inline int get_chroma_qp(H264Context *h, int t, int qscale){ return h->pps.chroma_qp_table[t][qscale]; } -static av_always_inline void pred_pskip_motion(H264Context * const h); +#include "h264_mvpred.h" //For pred_pskip_motion() static void fill_decode_neighbors(H264Context *h, int mb_type){ MpegEncContext * const s = &h->s; @@ -1341,6 +1341,4 @@ static void av_unused decode_mb_skip(H264Context *h){ h->prev_mb_skipped= 1; } -#include "h264_mvpred.h" //For pred_pskip_motion() - #endif /* AVCODEC_H264_H */ |