Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / roqvideodec.c

diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 8e3bdb0dc30ce86d8c061453f3766e3ba381737e..f0977f649146a1f155382694e5c254c860d0ffe8 100644 (file)
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file libavcodec/roqvideodec.c
+ * @file
  * id RoQ Video Decoder by Dr. Tim Ferguson
  * For more information about the id RoQ format, visit:
  *   http://www.csse.monash.edu.au/~timf/
@@ -159,6 +159,8 @@ static av_cold int roq_decode_init(AVCodecContext *avctx)
     s->avctx = avctx;
     s->width = avctx->width;
     s->height = avctx->height;
+    avcodec_get_frame_defaults(&s->frames[0]);
+    avcodec_get_frame_defaults(&s->frames[1]);
     s->last_frame    = &s->frames[0];
     s->current_frame = &s->frames[1];
     avctx->pix_fmt = PIX_FMT_YUV444P;
@@ -210,9 +212,9 @@ static av_cold int roq_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec roq_decoder = {
+AVCodec ff_roq_decoder = {
     "roqvideo",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_ROQ,
     sizeof(RoqContext),
     roq_decode_init,