virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-25 12:26:08 +02:00
commit 21ba80214c
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/h264_cabac.c
View File

@ -28,6 +28,7 @@
#define CABAC(h) 1 #define CABAC(h) 1
#define UNCHECKED_BITSTREAM_READER 1 #define UNCHECKED_BITSTREAM_READER 1
#include "libavutil/attributes.h"
#include "config.h" #include "config.h"
#include "cabac.h" #include "cabac.h"
#include "cabac_functions.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, static av_noinline void decode_cabac_residual_dc_internal(H264Context *h,
int cat, int n, int16_t *block,
const uint8_t *scantable, int cat, int n,
int max_coeff) const uint8_t *scantable,
int max_coeff)
{ {
decode_cabac_residual_internal(h, block, cat, n, scantable, NULL, max_coeff, 1, 0); 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, static av_noinline void decode_cabac_residual_dc_internal_422(H264Context *h,
int cat, int n, const uint8_t *scantable, int16_t *block,
int max_coeff) 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); 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, static av_noinline void decode_cabac_residual_nondc_internal(H264Context *h,
int cat, int n, int16_t *block,
const uint8_t *scantable, int cat, int n,
const uint32_t *qmul, const uint8_t *scantable,
int max_coeff) const uint32_t *qmul,
int max_coeff)
{ {
decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0, 0); decode_cabac_residual_internal(h, block, cat, n, scantable, qmul, max_coeff, 0, 0);
} }