[FFmpeg-cvslog] adpcm: don't duplicate identical AVSampleFmt array for each encoder.

Ronald S. Bultje git at videolan.org
Sun Jul 22 22:22:49 CEST 2012


ffmpeg | branch: master | Ronald S. Bultje <rsbultje at gmail.com> | Sat Jul 21 08:56:18 2012 -0700| [98041afb5f50536fa3edde9bed1a586d6e2e56e8] | committer: Ronald S. Bultje

adpcm: don't duplicate identical AVSampleFmt array for each encoder.

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

 libavcodec/adpcmenc.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
index 73c5403..fa40c22 100644
--- a/libavcodec/adpcmenc.c
+++ b/libavcodec/adpcmenc.c
@@ -716,6 +716,9 @@ error:
     return AVERROR(ENOMEM);
 }
 
+static const enum AVSampleFormat sample_fmts[] = {
+    AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE
+};
 
 #define ADPCM_ENCODER(id_, name_, long_name_)               \
 AVCodec ff_ ## name_ ## _encoder = {                        \
@@ -726,8 +729,7 @@ AVCodec ff_ ## name_ ## _encoder = {                        \
     .init           = adpcm_encode_init,                    \
     .encode2        = adpcm_encode_frame,                   \
     .close          = adpcm_encode_close,                   \
-    .sample_fmts    = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16,    \
-                                                      AV_SAMPLE_FMT_NONE }, \
+    .sample_fmts    = sample_fmts,                          \
     .long_name      = NULL_IF_CONFIG_SMALL(long_name_),     \
 }
 



More information about the ffmpeg-cvslog mailing list