OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
960964f
)
sanity check
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 9 Feb 2007 02:25:23 +0000
(
02:25
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 9 Feb 2007 02:25:23 +0000
(
02:25
+0000)
Originally committed as revision 7890 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/error_resilience.c
patch
|
blob
|
history
diff --git
a/libavcodec/error_resilience.c
b/libavcodec/error_resilience.c
index
0923721
..
2e15df3
100644
(file)
--- a/
libavcodec/error_resilience.c
+++ b/
libavcodec/error_resilience.c
@@
-618,6
+618,11
@@
void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en
const int end_xy = s->mb_index2xy[end_i];
int mask= -1;
+ if(start_i > end_i || start_xy > end_xy){
+ av_log(s->avctx, AV_LOG_ERROR, "internal error, slice end before start\n");
+ return;
+ }
+
if(!s->error_resilience) return;
mask &= ~VP_START;