[SCM] libav/experimental: infinite loop fix
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:40:34 UTC 2013
The following commit has been merged in the experimental branch:
commit 676e61c7bbc5b48a7b9f6ca2ca227e345e3d4580
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Jun 3 14:17:59 2004 +0000
infinite loop fix
Originally committed as revision 3188 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 1ffefa1..4394432 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -651,7 +651,7 @@ retry:
s->current_picture.key_frame= s->pict_type == I_TYPE;
/* skip b frames if we dont have reference frames */
- if(s->last_picture_ptr==NULL && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size);
+ if(s->last_picture_ptr==NULL && (s->pict_type==B_TYPE || s->dropable)) return get_consumed_bytes(s, buf_size);
/* skip b frames if we are in a hurry */
if(avctx->hurry_up && s->pict_type==B_TYPE) return get_consumed_bytes(s, buf_size);
/* skip everything if we are in a hurry>=5 */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list