mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'
* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c': msmpeg4: Drop disabled debug cruft Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
95a29b1a82
@ -414,13 +414,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s)
|
||||
av_log(s->avctx, AV_LOG_ERROR, "invalid picture type\n");
|
||||
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);
|
||||
if(s->qscale==0){
|
||||
av_log(s->avctx, AV_LOG_ERROR, "invalid qscale\n");
|
||||
|
@ -314,11 +314,6 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s,
|
||||
|
||||
mx += 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];
|
||||
|
||||
code = mv->table_mv_index[(mx << 6) | my];
|
||||
|
Loading…
Reference in New Issue
Block a user