Mercurial > libavcodec.hg
comparison mpeg12.c @ 10678:fe3cdc16514b libavcodec
Be less picky on invalid frame_pred_frame_dct values.
Fixed issue1615.
| author | michael |
|---|---|
| date | Sat, 12 Dec 2009 19:44:01 +0000 |
| parents | 7f6911429cdc |
| children | 6d22c964c601 |
comparison
equal
deleted
inserted
replaced
| 10677:abf5c20eebf4 | 10678:fe3cdc16514b |
|---|---|
| 1555 if(s->picture_structure==0 || (s->progressive_frame && s->picture_structure!=PICT_FRAME)){ | 1555 if(s->picture_structure==0 || (s->progressive_frame && s->picture_structure!=PICT_FRAME)){ |
| 1556 av_log(s->avctx, AV_LOG_ERROR, "picture_structure %d invalid, ignoring\n", s->picture_structure); | 1556 av_log(s->avctx, AV_LOG_ERROR, "picture_structure %d invalid, ignoring\n", s->picture_structure); |
| 1557 s->picture_structure= PICT_FRAME; | 1557 s->picture_structure= PICT_FRAME; |
| 1558 } | 1558 } |
| 1559 | 1559 |
| 1560 if(s->progressive_frame && !s->frame_pred_frame_dct){ | 1560 if(s->progressive_sequence && !s->frame_pred_frame_dct){ |
| 1561 av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); | 1561 av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); |
| 1562 s->frame_pred_frame_dct= 1; | 1562 s->frame_pred_frame_dct= 1; |
| 1563 } | 1563 } |
| 1564 | 1564 |
| 1565 if(s->picture_structure == PICT_FRAME){ | 1565 if(s->picture_structure == PICT_FRAME){ |