mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to...

[ffmpeg] / libavcodec / adx.c

diff --git a/libavcodec/adx.c b/libavcodec/adx.c
index aa90fd89c3dfba9f4c1cfd8f84f54ee4d62d5900..63358650ed03a51ee269e29d7f3bc2ab571a2996 100644 (file)
--- a/libavcodec/adx.c
+++ b/libavcodec/adx.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 #include "adx.h"
@@ -52,13 +53,13 @@ int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf,
 
     /* check for encoding=3 block_size=18, sample_size=4 */
     if (buf[4] != 3 || buf[5] != 18 || buf[6] != 4) {
-        av_log_ask_for_sample(avctx, "unsupported ADX format\n");
+        avpriv_request_sample(avctx, "Support for this ADX format");
         return AVERROR_PATCHWELCOME;
     }
 
     /* channels */
     avctx->channels = buf[7];
-    if (avctx->channels > 2)
+    if (avctx->channels <= 0 || avctx->channels > 2)
         return AVERROR_INVALIDDATA;
 
     /* sample rate */