← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/libvo-amrwbenc.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/libvo-amrwbenc.c
34
34
} AMRWBContext;
35
35
 
36
36
static const AVOption options[] = {
37
 
    { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRWBContext, allow_dtx), FF_OPT_TYPE_INT, 0, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
 
37
    { "dtx", "Allow DTX (generate comfort noise)", offsetof(AMRWBContext, allow_dtx), AV_OPT_TYPE_INT, { 0 }, 0, 1, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
38
38
    { NULL }
39
39
};
40
40
 
118
118
}
119
119
 
120
120
AVCodec ff_libvo_amrwbenc_encoder = {
121
 
    "libvo_amrwbenc",
122
 
    AVMEDIA_TYPE_AUDIO,
123
 
    CODEC_ID_AMR_WB,
124
 
    sizeof(AMRWBContext),
125
 
    amr_wb_encode_init,
126
 
    amr_wb_encode_frame,
127
 
    amr_wb_encode_close,
128
 
    NULL,
 
121
    .name           = "libvo_amrwbenc",
 
122
    .type           = AVMEDIA_TYPE_AUDIO,
 
123
    .id             = CODEC_ID_AMR_WB,
 
124
    .priv_data_size = sizeof(AMRWBContext),
 
125
    .init           = amr_wb_encode_init,
 
126
    .encode         = amr_wb_encode_frame,
 
127
    .close          = amr_wb_encode_close,
129
128
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
130
129
    .long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate "
131
130
                                      "(AMR) Wide-Band"),