[2/3] libvo-*: Use the new AV prefixed sample formats

Message ID 1302594268-81662-2-git-send-email-martin@martin.st
State Superseded
Headers show

Commit Message

Martin Storsjö April 12, 2011, 7:44 a.m.
---
 libavcodec/libvo-aacenc.c   |    2 +-
 libavcodec/libvo-amrwbenc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Diego Biurrun April 12, 2011, 9:29 a.m. | #1
On Tue, Apr 12, 2011 at 10:44:27AM +0300, Martin Storsjö wrote:
> 
> --- a/libavcodec/libvo-aacenc.c
> +++ b/libavcodec/libvo-aacenc.c
> @@ -122,7 +122,7 @@ AVCodec ff_libvo_aacenc_encoder = {
>      NULL,
> -    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
> +    .sample_fmts = (const enum SampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},

enum SampleFormat is (also) deprecated.

> --- a/libavcodec/libvo-amrwbenc.c
> +++ b/libavcodec/libvo-amrwbenc.c
> @@ -120,7 +120,7 @@ AVCodec ff_libvo_amrwbenc_encoder = {
>      amr_wb_encode_close,
>      NULL,
> -    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
> +    .sample_fmts = (const enum SampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},

ditto

Diego

Patch

diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c
index eb34058..3c7dde7 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 SampleFormat[]){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..56717cd 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 SampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("libvo-amrwbenc Adaptive Multi-Rate "
                                       "(AMR) Wide-Band"),
 };