← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic

« back to all changes in this revision

Viewing changes to libavcodec/flvdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-12-21 15:32:13 UTC
  • mto: (1.2.18)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20121221153213-fudzrugjzivtv0wp
Tags: upstream-9~beta3
Import upstream version 9~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/flvdec.c
89
89
    s->height = height;
90
90
 
91
91
    s->pict_type = AV_PICTURE_TYPE_I + get_bits(&s->gb, 2);
92
 
    s->dropable= s->pict_type > AV_PICTURE_TYPE_P;
93
 
    if (s->dropable)
 
92
    s->droppable = s->pict_type > AV_PICTURE_TYPE_P;
 
93
    if (s->droppable)
94
94
        s->pict_type = AV_PICTURE_TYPE_P;
95
95
 
96
96
    skip_bits1(&s->gb); /* deblocking flag */
109
109
 
110
110
    if(s->avctx->debug & FF_DEBUG_PICT_INFO){
111
111
        av_log(s->avctx, AV_LOG_DEBUG, "%c esc_type:%d, qp:%d num:%d\n",
112
 
               s->dropable ? 'D' : av_get_picture_type_char(s->pict_type), s->h263_flv-1, s->qscale, s->picture_number);
 
112
               s->droppable ? 'D' : av_get_picture_type_char(s->pict_type),
 
113
               s->h263_flv - 1, s->qscale, s->picture_number);
113
114
    }
114
115
 
115
116
    s->y_dc_scale_table=