comparison mpeg12.c @ 1289:57172377849a libavcodec

fix mpeg1/2 decoding if there are no 0 bytes after the bitstream print mpeg1/2 startcodes support

1288:10c21dffe5ab

                }
            }

            s->mb_x = 0;
            s->mb_y++;
        }

        /* skip mb handling */
        if (s->mb_skip_run == -1) {
            /* read again increment */

                    s->mb_skip_run += code;
                    break;
                }
            }
        }
        if(s->mb_y<<field_pic >= s->mb_height){
            fprintf(stderr, "slice too long\n");
            return -1;
        }
    }
eos: // end of slice
    *buf += get_bits_count(&s->gb)/8 - 1;
//printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
    return 0;

                if(s2->last_picture_ptr) //FIXME merge with the stuff in mpeg_decode_slice
                    *data_size = sizeof(AVPicture);
            }
            return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
        }

                /* prepare data for next start code */
                input_size = buf_end - buf_ptr;
                switch(start_code) {
                case SEQ_START_CODE:
                    mpeg1_decode_sequence(avctx, buf_ptr, 
                                          input_size);
                    break;

1289:57172377849a

                }
            }

            s->mb_x = 0;
            s->mb_y++;

            if(s->mb_y<<field_pic >= s->mb_height){
                int left= s->gb.size_in_bits - get_bits_count(&s->gb);

                if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)))
                   || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){
                    fprintf(stderr, "end missmatch left=%d\n", left);
                    return -1;
                }else
                    goto eos;
            }
        }

        /* skip mb handling */
        if (s->mb_skip_run == -1) {
            /* read again increment */

                    s->mb_skip_run += code;
                    break;
                }
            }
        }
    }
eos: // end of slice
    *buf += get_bits_count(&s->gb)/8 - 1;
//printf("y %d %d %d %d\n", s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y);
    return 0;

                if(s2->last_picture_ptr) //FIXME merge with the stuff in mpeg_decode_slice
                    *data_size = sizeof(AVPicture);
            }
            return FFMAX(0, buf_ptr - buf - s2->parse_context.last_index);
        }
        
        input_size = buf_end - buf_ptr;

        if(avctx->debug & FF_DEBUG_STARTCODE){
            printf("%3X at %d left %d\n", start_code, buf_ptr-buf, input_size);
        }

                /* prepare data for next start code */
                switch(start_code) {
                case SEQ_START_CODE:
                    mpeg1_decode_sequence(avctx, buf_ptr, 
                                          input_size);
                    break;