Mercurial > libavcodec.hg
comparison h264.c @ 5629:7e5ebda833e9 libavcodec
Remove error raising when explicitely skipping frame
patch by Carl Eugen Hoyos: [cehoyos ag or at]
original thread:
[FFmpeg-devel] [PATCH] Don't let ctx->skip_frame>0 produce errors
date: 08/30/2007 01:30 PM
| author | benoit |
|---|---|
| date | Mon, 03 Sep 2007 08:46:24 +0000 |
| parents | 81226e690378 |
| children | 550e37ec2204 |
comparison
equal
deleted
inserted
replaced
| 5628:cf88751d8ab7 | 5629:7e5ebda833e9 |
|---|---|
| 7966 buf_index=decode_nal_units(h, buf, buf_size); | 7966 buf_index=decode_nal_units(h, buf, buf_size); |
| 7967 if(buf_index < 0) | 7967 if(buf_index < 0) |
| 7968 return -1; | 7968 return -1; |
| 7969 | 7969 |
| 7970 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ | 7970 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ |
| 7971 if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0; | |
| 7971 av_log(avctx, AV_LOG_ERROR, "no frame!\n"); | 7972 av_log(avctx, AV_LOG_ERROR, "no frame!\n"); |
| 7972 return -1; | 7973 return -1; |
| 7973 } | 7974 } |
| 7974 | 7975 |
| 7975 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){ | 7976 if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){ |