diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-25 12:26:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-25 12:26:14 +0200 |
| commit | 21ba80214c0690c8d1fcc359c2645c363470701b (patch) | |
| tree | dc3dce50cfefd488871dcc42ea83bcca6f1bcedc | |
| parent | 626739ebbb76b14b03c9946c192570938f5e2494 (diff) | |
| parent | ff9d57e7dfc8c171bea3fb9129aa87fa28d89f18 (diff) | |
| download | ffmpeg-21ba80214c0690c8d1fcc359c2645c363470701b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_cabac.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 60048e0112..7b1ee05e3d 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -28,6 +28,7 @@ #define CABAC(h) 1 #define UNCHECKED_BITSTREAM_READER 1 +#include "libavutil/attributes.h" #include "config.h" #include "cabac.h" #include "cabac_functions.h" @@ -1740,26 +1741,30 @@ decode_cabac_residual_internal(H264Context *h, int16_t *block, } -static void decode_cabac_residual_dc_internal(H264Context *h, int16_t *block, - int cat, int n, - const uint8_t *scantable, - int max_coeff) +static av_noinline void decode_cabac_residual_dc_internal(H264Context *h, + int16_t *block, + int cat, int n, + const uint8_t *scantable, + int max_coeff) { decode_cabac_residual_internal(h, block, cat, n, scantable, NULL, max_coeff, 1, 0); } -static void decode_cabac_residual_dc_internal_422(H264Context *h, int16_t *block, - int cat, int n, const uint8_t *scantable, - int max_coeff) +static av_noinline void decode_cabac_residual_dc_internal_422(H264Context *h, + int16_t *block, + int cat, int n, + const uint8_t *scantable, + int max_coeff) { decode_cabac_residual_internal(h, block, cat, n, scantable, NULL, max_coeff, 1, 1); } -static void decode_cabac_residual_nondc_internal(H264Context *h, int16_t *block, - int cat, int n, - const uint8_t *scantable, - const uint32_t *qmul, - int max_coeff) +static av_noinline void decode_cabac_residual_nondc_internal(H264Context *h, + int16_t *block, + int cat, int n, + const uint8_t *scantable, + const uint32_t *qmul, + int max_coeff) { decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0, 0); } |