Revision 755bfeab libavcodec/mpeg12.c

View differences:

libavcodec/mpeg12.c
1000 1000
                /* store the vlc & sign at once */
1001 1001
                put_bits(&s->pb, table_vlc[code][1]+1, (table_vlc[code][0]<<1) + sign);
1002 1002
            } else {
1003
                /* escape seems to be pretty rare <5% so i dont optimize it */
1003
                /* escape seems to be pretty rare <5% so I do not optimize it */
1004 1004
                put_bits(&s->pb, table_vlc[111][1], table_vlc[111][0]);
1005 1005
                /* escape: only clip in this case */
1006 1006
                put_bits(&s->pb, 6, run);
......
3178 3178
                int mb_y= start_code - SLICE_MIN_START_CODE;
3179 3179

  
3180 3180
                if(s2->last_picture_ptr==NULL){
3181
                /* skip b frames if we dont have reference frames */
3181
                /* Skip B-frames if we do not have reference frames. */
3182 3182
                    if(s2->pict_type==B_TYPE) break;
3183
                /* skip P frames if we dont have reference frame no valid header */
3183
                /* Skip P-frames if we do not have reference frame no valid header. */
3184 3184
//                    if(s2->pict_type==P_TYPE && s2->first_field && !s2->first_slice) break;
3185 3185
                }
3186
                /* skip b frames if we are in a hurry */
3186
                /* Skip B-frames if we are in a hurry. */
3187 3187
                if(avctx->hurry_up && s2->pict_type==B_TYPE) break;
3188 3188
                if(  (avctx->skip_frame >= AVDISCARD_NONREF && s2->pict_type==B_TYPE)
3189 3189
                    ||(avctx->skip_frame >= AVDISCARD_NONKEY && s2->pict_type!=I_TYPE)
3190 3190
                    || avctx->skip_frame >= AVDISCARD_ALL)
3191 3191
                    break;
3192
                /* skip everything if we are in a hurry>=5 */
3192
                /* Skip everything if we are in a hurry>=5. */
3193 3193
                if(avctx->hurry_up>=5) break;
3194 3194

  
3195 3195
                if (!s->mpeg_enc_ctx_allocated) break;

Also available in: Unified diff