cavsdec: Fix assertion failure.

[ffmpeg] / libavcodec / libvorbisdec.c

diff --git a/libavcodec/libvorbisdec.c b/libavcodec/libvorbisdec.c
index b9e5fe1232090628fb33b5dd3bc42e3bd6678e5c..93c65b88b721595c1a9e5c6e790d81ae1e0c3f0c 100644 (file)
--- a/libavcodec/libvorbisdec.c
+++ b/libavcodec/libvorbisdec.c
@@ -48,7 +48,7 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) {
 
     if(p[0] == 0 && p[1] == 30) {
         for(i = 0; i < 3; i++){
-            hsizes[i] = bytestream_get_be16(&p);
+            hsizes[i] = bytestream_get_be16((const uint8_t **)&p);
             headers[i] = p;
             p += hsizes[i];
         }
@@ -190,7 +190,7 @@ static int oggvorbis_decode_close(AVCodecContext *avccontext) {
 AVCodec ff_libvorbis_decoder = {
     .name           = "libvorbis",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_VORBIS,
+    .id             = AV_CODEC_ID_VORBIS,
     .priv_data_size = sizeof(OggVorbisDecContext),
     .init           = oggvorbis_decode_init,
     .decode         = oggvorbis_decode_frame,