Revision 5d6e4c16 libavcodec/aacdec.c

View differences:

libavcodec/aacdec.c
545 545
            return -1;
546 546
    }
547 547

  
548
    avctx->sample_fmt = SAMPLE_FMT_S16;
548
    avctx->sample_fmt = AV_SAMPLE_FMT_S16;
549 549

  
550 550
    AAC_INIT_VLC_STATIC( 0, 304);
551 551
    AAC_INIT_VLC_STATIC( 1, 270);
......
2369 2369
    aac_decode_close,
2370 2370
    aac_decode_frame,
2371 2371
    .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"),
2372
    .sample_fmts = (const enum SampleFormat[]) {
2373
        SAMPLE_FMT_S16,SAMPLE_FMT_NONE
2372
    .sample_fmts = (const enum AVSampleFormat[]) {
2373
        AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE
2374 2374
    },
2375 2375
    .channel_layouts = aac_channel_layout,
2376 2376
};
......
2389 2389
    .close  = aac_decode_close,
2390 2390
    .decode = latm_decode_frame,
2391 2391
    .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Codec LATM syntax)"),
2392
    .sample_fmts = (const enum SampleFormat[]) {
2393
        SAMPLE_FMT_S16,SAMPLE_FMT_NONE
2392
    .sample_fmts = (const enum AVSampleFormat[]) {
2393
        AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE
2394 2394
    },
2395 2395
    .channel_layouts = aac_channel_layout,
2396 2396
};

Also available in: Unified diff