[FFmpeg-cvslog] libvo-*: Don't use deprecated sample format names and enum names

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Tue Apr 12 10:33:35 2011 +0300| [c5e03cebd31e5bd2b6851d09a60280403a57faf0] | committer: Martin Storsjö

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

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5e03cebd31e5bd2b6851d09a60280403a57faf0
---

 libavcodec/libvo-aacenc.c   |    2 +-
 libavcodec/libvo-amrwbenc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c
index eb34058..205c00e 100644
--- 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"),
 };
 
diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c
index 45da104..661a15d 100644
--- 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"),
 };