← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/vcr1.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/vcr1.c
114
114
    *picture= *(AVFrame*)&a->picture;
115
115
    *data_size = sizeof(AVPicture);
116
116
 
117
 
    emms_c();
118
 
 
119
117
    return buf_size;
120
118
}
121
119
 
130
128
    p->pict_type= AV_PICTURE_TYPE_I;
131
129
    p->key_frame= 1;
132
130
 
133
 
    emms_c();
134
 
 
135
 
    align_put_bits(&a->pb);
 
131
    avpriv_align_put_bits(&a->pb);
136
132
    while(get_bit_count(&a->pb)&31)
137
133
        put_bits(&a->pb, 8, 0);
138
134
 
177
173
#endif
178
174
 
179
175
AVCodec ff_vcr1_decoder = {
180
 
    "vcr1",
181
 
    AVMEDIA_TYPE_VIDEO,
182
 
    CODEC_ID_VCR1,
183
 
    sizeof(VCR1Context),
184
 
    decode_init,
185
 
    NULL,
186
 
    decode_end,
187
 
    decode_frame,
188
 
    CODEC_CAP_DR1,
 
176
    .name           = "vcr1",
 
177
    .type           = AVMEDIA_TYPE_VIDEO,
 
178
    .id             = CODEC_ID_VCR1,
 
179
    .priv_data_size = sizeof(VCR1Context),
 
180
    .init           = decode_init,
 
181
    .close          = decode_end,
 
182
    .decode         = decode_frame,
 
183
    .capabilities   = CODEC_CAP_DR1,
189
184
    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
190
185
};
191
186
 
192
187
#if CONFIG_VCR1_ENCODER
193
188
AVCodec ff_vcr1_encoder = {
194
 
    "vcr1",
195
 
    AVMEDIA_TYPE_VIDEO,
196
 
    CODEC_ID_VCR1,
197
 
    sizeof(VCR1Context),
198
 
    encode_init,
199
 
    encode_frame,
200
 
    //encode_end,
 
189
    .name           = "vcr1",
 
190
    .type           = AVMEDIA_TYPE_VIDEO,
 
191
    .id             = CODEC_ID_VCR1,
 
192
    .priv_data_size = sizeof(VCR1Context),
 
193
    .init           = encode_init,
 
194
    .encode         = encode_frame,
201
195
    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
202
196
};
203
197
#endif