← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/r210dec.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/r210dec.c
98
98
 
99
99
#if CONFIG_R210_DECODER
100
100
AVCodec ff_r210_decoder = {
101
 
    "r210",
102
 
    AVMEDIA_TYPE_VIDEO,
103
 
    CODEC_ID_R210,
104
 
    0,
105
 
    decode_init,
106
 
    NULL,
107
 
    decode_close,
108
 
    decode_frame,
109
 
    CODEC_CAP_DR1,
 
101
    .name           = "r210",
 
102
    .type           = AVMEDIA_TYPE_VIDEO,
 
103
    .id             = CODEC_ID_R210,
 
104
    .init           = decode_init,
 
105
    .close          = decode_close,
 
106
    .decode         = decode_frame,
 
107
    .capabilities   = CODEC_CAP_DR1,
110
108
    .long_name = NULL_IF_CONFIG_SMALL("Uncompressed RGB 10-bit"),
111
109
};
112
110
#endif
113
111
#if CONFIG_R10K_DECODER
114
112
AVCodec ff_r10k_decoder = {
115
 
    "r10k",
116
 
    AVMEDIA_TYPE_VIDEO,
117
 
    CODEC_ID_R10K,
118
 
    0,
119
 
    decode_init,
120
 
    NULL,
121
 
    decode_close,
122
 
    decode_frame,
123
 
    CODEC_CAP_DR1,
 
113
    .name           = "r10k",
 
114
    .type           = AVMEDIA_TYPE_VIDEO,
 
115
    .id             = CODEC_ID_R10K,
 
116
    .init           = decode_init,
 
117
    .close          = decode_close,
 
118
    .decode         = decode_frame,
 
119
    .capabilities   = CODEC_CAP_DR1,
124
120
    .long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
125
121
};
126
122
#endif