summaryrefslogtreecommitdiff
path: root/libavcodec/h261.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-07-14 21:39:36 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-07-14 21:39:36 +0000
commit8c3eba7c625fb9bf4b6e254b216871cac2b91283 (patch)
tree5e709f18b895d14f5b10bbe9f6e458a7e98d0e49 /libavcodec/h261.c
parentfec9ccb7e6fdc6844b1e2d1bb95436b36f47a412 (diff)
downloadffmpeg-8c3eba7c625fb9bf4b6e254b216871cac2b91283.tar.gz
skip_idct
skip_frame skip_loop_filter Originally committed as revision 4440 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h261.c')
-rw-r--r--libavcodec/h261.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index f9e148455c..a823cc39bc 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -970,6 +970,10 @@ retry:
/* skip everything if we are in a hurry>=5 */
if(avctx->hurry_up>=5) return get_consumed_bytes(s, buf_size);
+ 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 get_consumed_bytes(s, buf_size);
if(MPV_frame_start(s, avctx) < 0)
return -1;