oggparsevorbis: Add some sanity checks to header packet ordering/presence.

[ffmpeg] / libavcodec / mmvideo.c

diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index 0b45b77474a29e58a05fd58b04bcf2dc9cccf143..6dbc0c44945deff6b820650f0bb1957e36a55851 100644 (file)
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavcodec/mmvideo.c
+ * @file
  * American Laser Games MM Video Decoder
  * by Peter Ross (pross@xvid.org)
  *
@@ -60,7 +60,7 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
 
     s->frame.reference = 1;
     if (avctx->get_buffer(avctx, &s->frame)) {
-        av_log(s->avctx, AV_LOG_ERROR, "mmvideo: get_buffer() failed\n");
+        av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
 
@@ -200,7 +200,7 @@ static av_cold int mm_decode_end(AVCodecContext *avctx)
 
 AVCodec mmvideo_decoder = {
     "mmvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_MMVIDEO,
     sizeof(MmContext),
     mm_decode_init,