[2/3] libvo-*: Don't use deprecated sample format names and enum names

Message ID 1302601030-97782-1-git-send-email-martin@martin.st
State Committed
Commit c5e03cebd31e5bd2b6851d09a60280403a57faf0
Headers show

Commit Message

Martin Storsjö April 12, 2011, 9:37 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:51 a.m. | #1
On Tue, Apr 12, 2011 at 12:37:10PM +0300, Martin Storsjö wrote:
> [...]

OK

Diego
Martin Storsjö April 12, 2011, 9:53 a.m. | #2
On Tue, 12 Apr 2011, Diego Biurrun wrote:

> On Tue, Apr 12, 2011 at 12:37:10PM +0300, Martin Storsjö wrote:
> > [...]
> 
> OK

Queued

// Martin

Patch

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"),
 };