[1/3] libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization

Message ID 1302594268-81662-1-git-send-email-martin@martin.st
State Committed
Commit c41eb2ade4f862dc5f5e7c09c717d4f7f911a15e
Headers show

Commit Message

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

Comments

Diego Biurrun April 12, 2011, 9:29 a.m. | #1
On Tue, Apr 12, 2011 at 10:44:26AM +0300, Martin Storsjö wrote:
> [...]

OK

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

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

Pushed this one

// Martin

Patch

diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c
index f21b738..4e24e26 100644
--- a/libavcodec/amrnbdec.c
+++ b/libavcodec/amrnbdec.c
@@ -1044,5 +1044,5 @@  AVCodec ff_amrnb_decoder = {
     .init           = amrnb_decode_init,
     .decode         = amrnb_decode_frame,
     .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"),
-    .sample_fmts    = (enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
+    .sample_fmts    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
 };
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 00df227..d4bb776 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -1233,5 +1233,5 @@  AVCodec ff_amrwb_decoder = {
     .init           = amrwb_decode_init,
     .decode         = amrwb_decode_frame,
     .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"),
-    .sample_fmts    = (enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
+    .sample_fmts    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
 };
diff --git a/libavcodec/g722.c b/libavcodec/g722.c
index 422a134..257292d 100644
--- a/libavcodec/g722.c
+++ b/libavcodec/g722.c
@@ -577,7 +577,7 @@  AVCodec ff_adpcm_g722_encoder = {
     .close          = g722_close,
     .encode         = g722_encode_frame,
     .long_name      = NULL_IF_CONFIG_SMALL("G.722 ADPCM"),
-    .sample_fmts    = (enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
+    .sample_fmts    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
 };
 #endif
 
diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c
index 65c2745..eb34058 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 = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,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 6f26d9b..45da104 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 = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+    .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("libvo-amrwbenc Adaptive Multi-Rate "
                                       "(AMR) Wide-Band"),
 };