diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-12-19 00:47:36 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-12-19 00:47:36 +0000 |
| commit | bed1707c9c274831173902542aaef1f8428e6331 (patch) | |
| tree | 1a2e2e84e76a93ca335cb2a846210c0def29fad1 /libavcodec/rv10.c | |
| parent | 4ff7c576f825a6d8bf94c344ec2d1a5243ebe09e (diff) | |
| download | ffmpeg-bed1707c9c274831173902542aaef1f8428e6331.tar.gz | |
fix crash
Originally committed as revision 2627 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/rv10.c')
| -rw-r--r-- | libavcodec/rv10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 08d59cf680..6e591bbde0 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -379,7 +379,7 @@ static int rv20_decode_picture_header(MpegEncContext *s) if(s->avctx->has_b_frames){ if (get_bits(&s->gb, 1)){ av_log(s->avctx, AV_LOG_ERROR, "unknown bit3 set\n"); - return -1; +// return -1; } seq= get_bits(&s->gb, 15); }else @@ -537,7 +537,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, } //if(s->pict_type == P_TYPE) return 0; - if (s->mb_x == 0 && s->mb_y == 0) { + if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { if(MPV_frame_start(s, avctx) < 0) return -1; } |