libvo-*: Don't use deprecated sample format names and enum names

Signed-off-by: Martin Storsjö <martin@martin.st>
14 years ago · c5e03cebd3
parent b5304f7b2e
commit c5e03cebd3
2 changed files with 2 additions and 2 deletions
--- a/libavcodec/libvo-aacenc.c
+++ b/libavcodec/libvo-aacenc.c
@ -122,7 +122,7 @@ AVCodec ff_libvo_aacenc_encoder = {
    aac_encode_frame,
    aac_encode_close,
    NULL,
-    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
    .long_name = NULL_IF_CONFIG_SMALL("libvo-aacenc AAC"),
 };

--- a/libavcodec/libvo-amrwbenc.c
+++ b/libavcodec/libvo-amrwbenc.c
@ -120,7 +120,7 @@ AVCodec ff_libvo_amrwbenc_encoder = {
    amr_wb_encode_frame,
    amr_wb_encode_close,
    NULL,
-    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
    .long_name = NULL_IF_CONFIG_SMALL("libvo-amrwbenc Adaptive Multi-Rate "
                                      "(AMR) Wide-Band"),
 };