correctly interleave audio and video according to specs

[ffmpeg] / libavcodec / adxdec.c

diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c
index 8765a456ddc9fc0bdfa7f43d4a0a60487374fd66..0af26013bbd680cd986cb834dfaeb3716c71854d 100644 (file)
--- a/libavcodec/adxdec.c
+++ b/libavcodec/adxdec.c
@@ -18,11 +18,13 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "adx.h"
 
 /**
- * @file adx.c
+ * @file libavcodec/adxdec.c
  * SEGA CRI adx codecs.
  *
  * Reference documents:
@@ -30,7 +32,7 @@
  * adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/
  */
 
-static av_cold void adx_decode_init(AVCodecContext *avctx)
+static av_cold int adx_decode_init(AVCodecContext *avctx)
 {
     avctx->sample_fmt = SAMPLE_FMT_S16;
     return 0;
@@ -171,6 +173,6 @@ AVCodec adpcm_adx_decoder = {
     NULL,
     NULL,
     adx_decode_frame,
-    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
 };