diff options
| author | Måns Rullgård <mans@mansr.com> | 2005-10-28 18:18:04 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2005-10-28 18:18:04 +0000 |
| commit | c7ea4f19037984d0c5614d194e0a4b47331d8f9a (patch) | |
| tree | 820c97b0dedaa5478cfbebe1da8c2709197545a5 | |
| parent | 5b0e811a65737463c7e4206b68a23e19d4473519 (diff) | |
| download | ffmpeg-c7ea4f19037984d0c5614d194e0a4b47331d8f9a.tar.gz | |
no mixing of code and declarations
Originally committed as revision 4670 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1695ccf849..c0129e2904 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6582,14 +6582,6 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8 const int mbm_type = s->current_picture.mb_type[mbm_xy]; int start = h->slice_table[mbm_xy] == 255 ? 1 : 0; - if (first_vertical_edge_done) { - start = 1; - first_vertical_edge_done = 0; - } - - if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy]) - start = 1; - const int edges = ((mb_type & mbm_type) & (MB_TYPE_16x16|MB_TYPE_SKIP)) == (MB_TYPE_16x16|MB_TYPE_SKIP) ? 1 : 4; // how often to recheck mv-based bS when iterating between edges @@ -6598,6 +6590,14 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8 // how often to recheck mv-based bS when iterating along each edge const int mask_par0 = mb_type & (MB_TYPE_16x16 | (MB_TYPE_8x16 >> dir)); + if (first_vertical_edge_done) { + start = 1; + first_vertical_edge_done = 0; + } + + if (h->deblocking_filter==2 && h->slice_table[mbm_xy] != h->slice_table[mb_xy]) + start = 1; + /* Calculate bS */ for( edge = start; edge < edges; edge++ ) { /* mbn_xy: neighbor macroblock */ |