generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Remove unused variables.

Browse Source 
Originally committed as revision 21815 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alexander Strange
2010-02-13 21:09:38 +00:00
parent 677dab59cb
commit 78998bf217
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@@ -979,8 +979,6 @@ static inline void backup_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src
static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg, int simple){ static inline void xchg_mb_border(H264Context *h, uint8_t *src_y, uint8_t *src_cb, uint8_t *src_cr, int linesize, int uvlinesize, int xchg, int simple){
MpegEncContext * const s = &h->s; MpegEncContext * const s = &h->s;
int temp8, i;
uint64_t temp64;
int deblock_left; int deblock_left;
int deblock_top; int deblock_top;
int mb_xy; int mb_xy;
@@ -2165,7 +2163,7 @@ static void loop_filter(H264Context *h){
if(h->deblocking_filter) { if(h->deblocking_filter) {
for(mb_x= 0; mb_x<s->mb_width; mb_x++){ for(mb_x= 0; mb_x<s->mb_width; mb_x++){
for(mb_y=end_mb_y - FRAME_MBAFF; mb_y<= end_mb_y; mb_y++){ for(mb_y=end_mb_y - FRAME_MBAFF; mb_y<= end_mb_y; mb_y++){
int list, mb_xy, mb_type; int mb_xy, mb_type;
mb_xy = h->mb_xy = mb_x + mb_y*s->mb_stride; mb_xy = h->mb_xy = mb_x + mb_y*s->mb_stride;
h->slice_num= h->slice_table[mb_xy]; h->slice_num= h->slice_table[mb_xy];
mb_type= s->current_picture.mb_type[mb_xy]; mb_type= s->current_picture.mb_type[mb_xy];

1
libavcodec/h264.h
View File

@@ -1136,7 +1136,6 @@ static int fill_filter_caches(H264Context *h, int mb_type){
const int mb_xy= h->mb_xy; const int mb_xy= h->mb_xy;
int top_xy, left_xy[2]; int top_xy, left_xy[2];
int top_type, left_type[2]; int top_type, left_type[2];
int i;
top_xy = mb_xy - (s->mb_stride << MB_FIELD); top_xy = mb_xy - (s->mb_stride << MB_FIELD);

5
libavcodec/h264_loopfilter.c
View File

@@ -514,7 +514,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
) )
*(uint64_t*)bS= 0x0004000400040004ULL; *(uint64_t*)bS= 0x0004000400040004ULL;
} else { } else {
int i, l; int i;
int mv_done; int mv_done;
if( dir && FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbm_type)) { if( dir && FRAME_MBAFF && IS_INTERLACED(mb_type ^ mbm_type)) {
@@ -590,7 +590,7 @@ static av_always_inline void filter_mb_dir(H264Context *h, int mb_x, int mb_y, u
if( IS_INTRA(mb_type)) { if( IS_INTRA(mb_type)) {
*(uint64_t*)bS= 0x0003000300030003ULL; *(uint64_t*)bS= 0x0003000300030003ULL;
} else { } else {
int i, l; int i;
int mv_done; int mv_done;
if( edge & mask_edge ) { if( edge & mask_edge ) {
@@ -657,7 +657,6 @@ void ff_h264_filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint
const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4; const int mvy_limit = IS_INTERLACED(mb_type) ? 2 : 4;
int first_vertical_edge_done = 0; int first_vertical_edge_done = 0;
av_unused int dir; av_unused int dir;
int list;
if (FRAME_MBAFF if (FRAME_MBAFF
// and current and left pair do not have the same interlaced type // and current and left pair do not have the same interlaced type