Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'c1fcfdec75'

Browse source 
* commit 'c1fcfdec75':
  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>
This commit is contained in:
Michael Niedermayer 2012-10-16 13:57:10 +02:00
commit 5717562c78
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libavcodec/rangecoder.c
View file

@ -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")
}