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:
17e1b3c
)
er: set error_occured on missing slices
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 19 Feb 2013 18:58:52 +0000
(19:58 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 19 Mar 2013 23:52:46 +0000
(
00:52
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/error_resilience.c
patch
|
blob
|
history
diff --git
a/libavcodec/error_resilience.c
b/libavcodec/error_resilience.c
index
da957d2
..
cdd28ab
100644
(file)
--- a/
libavcodec/error_resilience.c
+++ b/
libavcodec/error_resilience.c
@@
-832,8
+832,10
@@
void ff_er_add_slice(ERContext *s, int startx, int starty,
int prev_status = s->error_status_table[s->mb_index2xy[start_i - 1]];
prev_status &= ~ VP_START;
- if (prev_status != (ER_MV_END | ER_DC_END | ER_AC_END))
+ if (prev_status != (ER_MV_END | ER_DC_END | ER_AC_END)) {
+ s->error_occurred = 1;
s->error_count = INT_MAX;
+ }
}
}