← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/mpeg4video_parser.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/mpeg4video_parser.c
99
99
    if (!pc->enc)
100
100
        return -1;
101
101
    pc->first_picture = 1;
 
102
    pc->enc->slice_context_count = 1;
102
103
    return 0;
103
104
}
104
105
 
130
131
 
131
132
 
132
133
AVCodecParser ff_mpeg4video_parser = {
133
 
    { CODEC_ID_MPEG4 },
134
 
    sizeof(ParseContext1),
135
 
    mpeg4video_parse_init,
136
 
    mpeg4video_parse,
137
 
    ff_parse1_close,
138
 
    ff_mpeg4video_split,
 
134
    .codec_ids      = { CODEC_ID_MPEG4 },
 
135
    .priv_data_size = sizeof(ParseContext1),
 
136
    .parser_init    = mpeg4video_parse_init,
 
137
    .parser_parse   = mpeg4video_parse,
 
138
    .parser_close   = ff_parse1_close,
 
139
    .split          = ff_mpeg4video_split,
139
140
};