diff options
author | Mike Melanson <mike@multimedia.cx> | 2005-04-24 17:21:11 +0000 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2005-04-24 17:21:11 +0000 |
commit | 160d679c075e9f575f96ea2c2c000545a49916a0 (patch) | |
tree | 5254d6f53383d530989b1fa99e72f6da3a391b27 /libavcodec/mpeg12.c | |
parent | 93ccc14df57008117631e369ba2e846ef4950a16 (diff) | |
download | ffmpeg-160d679c075e9f575f96ea2c2c000545a49916a0.tar.gz |
Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
Originally committed as revision 4153 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index fd75381718..b06fe51b87 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -226,10 +226,10 @@ static int encode_init(AVCodecContext *avctx) if(find_frame_rate_index(s) < 0){ if(s->strict_std_compliance >=0){ - av_log(avctx, AV_LOG_ERROR, "MPEG1/2 doesnt support %d/%d fps\n", avctx->frame_rate, avctx->frame_rate_base); + av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", avctx->frame_rate, avctx->frame_rate_base); return -1; }else{ - av_log(avctx, AV_LOG_INFO, "MPEG1/2 doesnt support %d/%d fps, there may be AV sync issues\n", avctx->frame_rate, avctx->frame_rate_base); + av_log(avctx, AV_LOG_INFO, "MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n", avctx->frame_rate, avctx->frame_rate_base); } } @@ -1055,11 +1055,11 @@ static int mpeg_decode_mb(MpegEncContext *s, dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y); - assert(s->mb_skiped==0); + assert(s->mb_skipped==0); if (s->mb_skip_run-- != 0) { if(s->pict_type == I_TYPE){ - av_log(s->avctx, AV_LOG_ERROR, "skiped MB in I frame at %d %d\n", s->mb_x, s->mb_y); + av_log(s->avctx, AV_LOG_ERROR, "skipped MB in I frame at %d %d\n", s->mb_x, s->mb_y); return -1; } @@ -1078,7 +1078,7 @@ static int mpeg_decode_mb(MpegEncContext *s, s->last_mv[0][0][0] = s->last_mv[0][0][1] = 0; s->last_mv[0][1][0] = s->last_mv[0][1][1] = 0; s->field_select[0][0]= s->picture_structure - 1; - s->mb_skiped = 1; + s->mb_skipped = 1; s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride ]= MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; } else { int mb_type; @@ -1101,7 +1101,7 @@ static int mpeg_decode_mb(MpegEncContext *s, // assert(s->current_picture.mb_type[ s->mb_x + s->mb_y*s->mb_stride - 1]&(MB_TYPE_16x16|MB_TYPE_16x8)); if((s->mv[0][0][0]|s->mv[0][0][1]|s->mv[1][0][0]|s->mv[1][0][1])==0) - s->mb_skiped = 1; + s->mb_skipped = 1; } return 0; |