aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2011-04-12 10:33:35 +0300
committerMartin Storsjö <martin@martin.st>2011-04-12 12:52:47 +0300
commitc5e03cebd31e5bd2b6851d09a60280403a57faf0 (patch)
tree4c1ff101a407b9c6d0fb191fc5a222b80931d4dd
parentb5304f7b2ec56b872e9a007d7f040930ebe55095 (diff)
downloadffmpeg-c5e03cebd31e5bd2b6851d09a60280403a57faf0.tar.gz
libvo-*: Don't use deprecated sample format names and enum names
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavcodec/libvo-aacenc.c2
-rw-r--r--libavcodec/libvo-amrwbenc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c
index eb340580a5..205c00e922 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 45da104f94..661a15d445 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"),
};