Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / ulti.c

diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c
index cd6f2d24ab860c75777a707c365535c0f350c541..52a6a861bf711b3d6d77d4f69095246db82dfdb4 100644 (file)
--- a/libavcodec/ulti.c
+++ b/libavcodec/ulti.c
@@ -50,7 +50,7 @@ static av_cold int ulti_decode_init(AVCodecContext *avctx)
     s->height = avctx->height;
     s->blocks = (s->width / 8) * (s->height / 8);
     avctx->pix_fmt = PIX_FMT_YUV410P;
-    avcodec_get_frame_defaults(&s->frame);
+    avctx->coded_frame = &s->frame;
     avctx->coded_frame = (AVFrame*) &s->frame;
     s->ulti_codebook = ulti_codebook;
 
@@ -427,5 +427,5 @@ AVCodec ff_ulti_decoder = {
     .close          = ulti_decode_end,
     .decode         = ulti_decode_frame,
     .capabilities   = CODEC_CAP_DR1,
-    .long_name = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
+    .long_name      = NULL_IF_CONFIG_SMALL("IBM UltiMotion"),
 };