Fix a crash when decoding tiff by moving check

[ffmpeg] / libavcodec / adxenc.c

diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 927ecd7b1a5d5bd4c8b0431ca10112df5087dfb0..2200f5c6c8fa3d32f64b513c00b6e05dd40c8abe 100644 (file)
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.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
  * SEGA CRI adx codecs.
  *
  * Reference documents:
@@ -183,12 +185,13 @@ static int adx_encode_frame(AVCodecContext *avctx,
 
 AVCodec adpcm_adx_encoder = {
     "adpcm_adx",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_ADPCM_ADX,
     sizeof(ADXContext),
     adx_encode_init,
     adx_encode_frame,
     adx_encode_close,
     NULL,
-    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX"),
+    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
+    .long_name = NULL_IF_CONFIG_SMALL("SEGA CRI ADX ADPCM"),
 };