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/flvdec.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/flvdec.c')
| -rw-r--r-- | libavcodec/flvdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 774fde775c..bb693d76c6 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -89,8 +89,8 @@ int ff_flv_decode_picture_header(MpegEncContext *s) s->height = height; s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2); - s->dropable= s->pict_type > AV_PICTURE_TYPE_P; - if (s->dropable) + s->droppable = s->pict_type > AV_PICTURE_TYPE_P; + if (s->droppable) s->pict_type = AV_PICTURE_TYPE_P; skip_bits1(&s->gb); /* deblocking flag */ @@ -109,7 +109,8 @@ int ff_flv_decode_picture_header(MpegEncContext *s) if(s->avctx->debug & FF_DEBUG_PICT_INFO){ av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n", - s->dropable ? 'D' : av_get_picture_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number); + s->droppable ? 'D' : av_get_picture_type_char(s->pict_type), + s->h263_flv - 1, s->qscale, s->picture_number); } s->y_dc_scale_table= |