diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:27:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-10 01:27:10 +0100 |
| commit | 78ac7ee97040a2e9a69b81f82a89edd779e124bb (patch) | |
| tree | bae6d10aa246d91b094bf2754efcb944049c7c46 /libavcodec/h263dec.c | |
| parent | 5c75708cf08d57ed4f9744201554d276c8d5c2e9 (diff) | |
| parent | 5d471b73d20616f5ac701ff62e5de49465cda264 (diff) | |
| download | ffmpeg-78ac7ee97040a2e9a69b81f82a89edd779e124bb.tar.gz | |
Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'
* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
rtpdec: K&R formatting and spelling cosmetics
cosmetics: Fix dropable --> droppable typo
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index d457466006..27e1c91cb6 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -628,7 +628,9 @@ retry: s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I; /* skip B-frames if we don't have reference frames */ - if(s->last_picture_ptr==NULL && (s->pict_type==AV_PICTURE_TYPE_B || s->dropable)) return get_consumed_bytes(s, buf_size); + if (s->last_picture_ptr == NULL && + (s->pict_type == AV_PICTURE_TYPE_B || s->droppable)) + return get_consumed_bytes(s, buf_size); if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B) || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I) || avctx->skip_frame >= AVDISCARD_ALL) |