flvdec: Fix compiler warning for uninitialized variables

[ffmpeg] / libavcodec / audioconvert.h

diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index e7d262bae57c69538e5f40e8d67a6c792e251d30..f50eb3e1bba026e12b5f8826922283782a2ef33f 100644 (file)
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -3,20 +3,20 @@
  * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
  * Copyright (c) 2008 Peter Ross
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -31,6 +31,7 @@
 
 #include "libavutil/cpu.h"
 #include "avcodec.h"
+#include "libavutil/audioconvert.h"
 
 #if FF_API_OLD_SAMPLE_FMT
 /**
@@ -49,23 +50,28 @@ const char *avcodec_get_sample_fmt_name(int sample_fmt);
  * @deprecated Use av_get_sample_fmt() instead.
  */
 attribute_deprecated
-enum SampleFormat avcodec_get_sample_fmt(const char* name);
+enum AVSampleFormat avcodec_get_sample_fmt(const char* name);
 #endif
 
+#if FF_API_OLD_AUDIOCONVERT
 /**
- * @return NULL on error
+ * @deprecated Use av_get_channel_layout() instead.
  */
-const char *avcodec_get_channel_name(int channel_id);
+attribute_deprecated
+int64_t avcodec_get_channel_layout(const char *name);
 
 /**
- * @return channel layout that matches name, 0 if no match
+ * @deprecated Use av_get_channel_layout_string() instead.
  */
-int64_t avcodec_get_channel_layout(const char *name);
+attribute_deprecated
+void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
 
 /**
- * Return description of channel layout
+ * @deprecated Use av_get_channel_layout_nb_channels() instead.
  */
-void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
+attribute_deprecated
+int avcodec_channel_layout_num_channels(int64_t channel_layout);
+#endif
 
 /**
  * Guess the channel layout
@@ -74,12 +80,7 @@ void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels,
  * @param fmt_name Format name, or NULL if unknown
  * @return Channel layout mask
  */
-int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
-
-/**
- * @return the number of channels in the channel layout.
- */
-int avcodec_channel_layout_num_channels(int64_t channel_layout);
+uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
 
 struct AVAudioConvert;
 typedef struct AVAudioConvert AVAudioConvert;
@@ -94,8 +95,8 @@ typedef struct AVAudioConvert AVAudioConvert;
  * @param flags See AV_CPU_FLAG_xx
  * @return NULL on error
  */
-AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels,
-                                       enum SampleFormat in_fmt, int in_channels,
+AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
+                                       enum AVSampleFormat in_fmt, int in_channels,
                                        const float *matrix, int flags);
 
 /**