~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/libfaac.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:
155
155
};
156
156
 
157
157
AVCodec ff_libfaac_encoder = {
158
 
    "libfaac",
159
 
    AVMEDIA_TYPE_AUDIO,
160
 
    CODEC_ID_AAC,
161
 
    sizeof(FaacAudioContext),
162
 
    Faac_encode_init,
163
 
    Faac_encode_frame,
164
 
    Faac_encode_close,
 
158
    .name           = "libfaac",
 
159
    .type           = AVMEDIA_TYPE_AUDIO,
 
160
    .id             = CODEC_ID_AAC,
 
161
    .priv_data_size = sizeof(FaacAudioContext),
 
162
    .init           = Faac_encode_init,
 
163
    .encode         = Faac_encode_frame,
 
164
    .close          = Faac_encode_close,
165
165
    .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
166
166
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
167
167
    .long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"),