Mercurial > libavcodec.hg
comparison h264.c @ 5647:7c139ea9065e libavcodec
Indentation
patch by Andreas ªÓman
author | benoit |
---|---|
date | Fri, 07 Sep 2007 19:19:49 +0000 |
parents | adc9ec0f7385 |
children | 070a376d496b |
comparison
equal
deleted
inserted
replaced
5646:adc9ec0f7385 | 5647:7c139ea9065e |
---|---|
3818 if(s->avctx->flags2 & CODEC_FLAG2_FAST) { | 3818 if(s->avctx->flags2 & CODEC_FLAG2_FAST) { |
3819 /* Cheat slightly for speed: | 3819 /* Cheat slightly for speed: |
3820 Dont bother to deblock across slices */ | 3820 Dont bother to deblock across slices */ |
3821 h->deblocking_filter = 2; | 3821 h->deblocking_filter = 2; |
3822 } else { | 3822 } else { |
3823 h0->max_contexts = 1; | 3823 h0->max_contexts = 1; |
3824 if(!h0->single_decode_warning) { | 3824 if(!h0->single_decode_warning) { |
3825 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n"); | 3825 av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n"); |
3826 h0->single_decode_warning = 1; | 3826 h0->single_decode_warning = 1; |
3827 } | 3827 } |
3828 if(h != h0) | 3828 if(h != h0) |
3829 return 1; // deblocking switched inside frame | 3829 return 1; // deblocking switched inside frame |
3830 } | 3830 } |
3831 } | 3831 } |
3832 | 3832 |
3833 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL | 3833 if( s->avctx->skip_loop_filter >= AVDISCARD_ALL |
3834 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) | 3834 ||(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY && h->slice_type != I_TYPE) |