Revision 5d6e4c16 libavcodec/libgsm.c

View differences:

libavcodec/libgsm.c
49 49
        if(!avctx->sample_rate)
50 50
            avctx->sample_rate= 8000;
51 51

  
52
        avctx->sample_fmt = SAMPLE_FMT_S16;
52
        avctx->sample_fmt = AV_SAMPLE_FMT_S16;
53 53
    }else{
54 54
        if (avctx->sample_rate != 8000) {
55 55
            av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
......
120 120
    libgsm_init,
121 121
    libgsm_encode_frame,
122 122
    libgsm_close,
123
    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
123
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
124 124
    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
125 125
};
126 126

  
......
132 132
    libgsm_init,
133 133
    libgsm_encode_frame,
134 134
    libgsm_close,
135
    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
135
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
136 136
    .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
137 137
};
138 138

  

Also available in: Unified diff