diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:57:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 13:57:10 +0200 |
| commit | 5717562c789f9be9c8e4bab7caec4df83f77cebe (patch) | |
| tree | 134e045d40aa79aca5d42fd00c72f317cf519a2d /libavcodec/rangecoder.c | |
| parent | 25f3827e1daf6b75e6b46e2bccaf8cbc273d6b42 (diff) | |
| parent | c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d (diff) | |
| download | ffmpeg-5717562c789f9be9c8e4bab7caec4df83f77cebe.tar.gz | |
Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
rangecoder-test: Return in case of an error
build: simplify enabling of compat objects
Conflicts:
configure
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
| -rw-r--r-- | libavcodec/rangecoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index 986fc4cafa..33984aa207 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -151,8 +151,10 @@ STOP_TIMER("put_rac") for (i = 0; i < SIZE; i++) { START_TIMER - if ((r[i] & 1) != get_rac(&c, state)) + if ((r[i] & 1) != get_rac(&c, state)) { av_log(NULL, AV_LOG_ERROR, "rac failure at %d\n", i); + return 1; + } STOP_TIMER("get_rac") } |