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:
90a5849
)
Simplify deblock_left/top condition for deblocking_filter=2
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 18 Feb 2010 12:37:43 +0000
(12:37 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 18 Feb 2010 12:37:43 +0000
(12:37 +0000)
Originally committed as revision 21876 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/h264.c
patch
|
blob
|
history
diff --git
a/libavcodec/h264.c
b/libavcodec/h264.c
index
6b42cbb
..
f0abd6b
100644
(file)
--- a/
libavcodec/h264.c
+++ b/
libavcodec/h264.c
@@
-996,9
+996,8
@@
static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_c
}
if(h->deblocking_filter == 2) {
- mb_xy = h->mb_xy;
- deblock_left = h->slice_table[mb_xy] == h->slice_table[mb_xy - 1];
- deblock_top = h->slice_table[mb_xy] == h->slice_table[h->top_mb_xy];
+ deblock_left = h->left_type[0];
+ deblock_top = h->top_type;
} else {
deblock_left = (s->mb_x > 0);
deblock_top = (s->mb_y > !!MB_FIELD);