zmbvdec: Check the buffer size for uncompressed data

[ffmpeg] / libavformat / yop.c

diff --git a/libavformat/yop.c b/libavformat/yop.c
index bffbe181753a0ea7f0e7b62e929e971521858b5e..5fe6bdc7d473d9c53b0331c6dd38df1ec66a5459 100644 (file)
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
@@ -72,14 +73,15 @@ static int yop_read_header(AVFormatContext *s)
     // Audio
     audio_dec               = audio_stream->codec;
     audio_dec->codec_type   = AVMEDIA_TYPE_AUDIO;
-    audio_dec->codec_id     = CODEC_ID_ADPCM_IMA_APC;
+    audio_dec->codec_id     = AV_CODEC_ID_ADPCM_IMA_APC;
     audio_dec->channels     = 1;
+    audio_dec->channel_layout = AV_CH_LAYOUT_MONO;
     audio_dec->sample_rate  = 22050;
 
     // Video
     video_dec               = video_stream->codec;
     video_dec->codec_type   = AVMEDIA_TYPE_VIDEO;
-    video_dec->codec_id     = CODEC_ID_YOP;
+    video_dec->codec_id     = AV_CODEC_ID_YOP;
 
     avio_skip(pb, 6);