Commit 95a29b1a authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'f2f145f3'

* commit 'f2f145f3':
  msmpeg4: Drop disabled debug cruft
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents 87cd8dc0 f2f145f3
...@@ -414,13 +414,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s) ...@@ -414,13 +414,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n"); av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
return -1; return -1;
} }
#if 0
{
static int had_i=0;
if(s->pict_type == AV_PICTURE_TYPE_I) had_i=1;
if(!had_i) return -1;
}
#endif
s->chroma_qscale= s->qscale = get_bits(&s->gb, 5); s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
if(s->qscale==0){ if(s->qscale==0){
av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n"); av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
......
...@@ -314,11 +314,6 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s, ...@@ -314,11 +314,6 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s,
mx += 32; mx += 32;
my += 32; my += 32;
#if 0
if ((unsigned)mx >= 64 ||
(unsigned)my >= 64)
av_log(s->avctx, AV_LOG_ERROR, "error mx=%d my=%d\n", mx, my);
#endif
mv = &ff_mv_tables[s->mv_table_index]; mv = &ff_mv_tables[s->mv_table_index];
code = mv->table_mv_index[(mx << 6) | my]; code = mv->table_mv_index[(mx << 6) | my];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment