summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/svq3.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2005-07-19 20:30:38 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2005-07-19 20:30:38 +0000
commitfcc9a6282dd3c541055636ac49882d1639da251b (patch)
tree588b324e232caccf8085c85c7119d8d29ee2b6e8 /src/libffmpeg/libavcodec/svq3.c
parent6bfc655ee19aa82cce3277e6f9c861661cca5fb4 (diff)
downloadxine-lib-fcc9a6282dd3c541055636ac49882d1639da251b.tar.gz
xine-lib-fcc9a6282dd3c541055636ac49882d1639da251b.tar.bz2
here is cvs update people requested - somebody please check for gcc4 compatibility
CVS patchset: 7668 CVS date: 2005/07/19 20:30:38
Diffstat (limited to 'src/libffmpeg/libavcodec/svq3.c')
-rw-r--r--src/libffmpeg/libavcodec/svq3.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/svq3.c b/src/libffmpeg/libavcodec/svq3.c
index 547679bf1..f0f995acf 100644
--- a/src/libffmpeg/libavcodec/svq3.c
+++ b/src/libffmpeg/libavcodec/svq3.c
@@ -896,6 +896,10 @@ static int svq3_decode_frame (AVCodecContext *avctx,
if (avctx->hurry_up && s->pict_type == B_TYPE) return 0;
/* skip everything if we are in a hurry >= 5 */
if (avctx->hurry_up >= 5) return 0;
+ if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==B_TYPE)
+ ||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=I_TYPE)
+ || avctx->skip_frame >= AVDISCARD_ALL)
+ return 0;
if (s->next_p_frame_damaged) {
if (s->pict_type == B_TYPE)