diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 23:02:41 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 23:02:41 +0300 |
| commit | 7026d8accdb2d3b013fec5c7c7620f1b769e6c7b (patch) | |
| tree | 0b48b19031c21354962ee60243977d46352871e9 /libavcodec/rl.h | |
| parent | c508fef3c737321ad719db6ec62e1d011726baa8 (diff) | |
| parent | 1b1bb2c4efc126d74d44d8c421860c85f932ecb1 (diff) | |
Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'
* commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1':
rl: Add error checking to ff_rl_init().
Conflicts:
libavcodec/rl.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rl.h')
| -rw-r--r-- | libavcodec/rl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rl.h b/libavcodec/rl.h index e4a6faa22c..33f4ef88de 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -52,7 +52,7 @@ typedef struct RLTable { * @param static_store static uint8_t array[2][2*MAX_RUN + MAX_LEVEL + 3] which will hold * the level and run tables, if this is NULL av_malloc() will be used */ -void ff_rl_init(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]); +int ff_rl_init(RLTable *rl, uint8_t static_store[2][2*MAX_RUN + MAX_LEVEL + 3]); void ff_rl_init_vlc(RLTable *rl, unsigned static_size); /** |