← Back to branch summary

~ppsspp/ppsspp/ffmpeg

« back to all changes in this revision

Viewing changes to libavcodec/vc1_parser.c

  • Committer: Henrik Rydgård
  • Date: 2014-01-03 10:44:32 UTC
  • Revision ID: git-v1:87c6c126784b1718bfa448ecf2e6a9fef781eb4e
Update our ffmpeg snapshot to a clone of the official repository.

This is because Maxim's at3plus support has been officially merged!

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vc1_parser.c
51
51
 
52
52
    for(start = buf, end = buf + buf_size; next < end; start = next){
53
53
        int buf2_size, size;
 
54
        int ret;
54
55
 
55
56
        next = find_next_marker(start + 4, end);
56
57
        size = next - start - 4;
66
67
            break;
67
68
        case VC1_CODE_FRAME:
68
69
            if(vpc->v.profile < PROFILE_ADVANCED)
69
 
                ff_vc1_parse_frame_header    (&vpc->v, &gb);
 
70
                ret = ff_vc1_parse_frame_header    (&vpc->v, &gb);
70
71
            else
71
 
                ff_vc1_parse_frame_header_adv(&vpc->v, &gb);
 
72
                ret = ff_vc1_parse_frame_header_adv(&vpc->v, &gb);
 
73
 
 
74
            if (ret < 0)
 
75
                break;
72
76
 
73
77
            /* keep AV_PICTURE_TYPE_BI internal to VC1 */
74
78
            if (vpc->v.s.pict_type == AV_PICTURE_TYPE_BI)