Merge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c'

[ffmpeg] / libavformat / frmdec.c

diff --git a/libavformat/frmdec.c b/libavformat/frmdec.c
index a6f19afcd41ce67c4581aa531324440263d91341..260afbc5882c6eaf798ae46cca5c299efbf653f9 100644 (file)
--- a/libavformat/frmdec.c
+++ b/libavformat/frmdec.c
@@ -25,6 +25,7 @@
  */
 
 #include "libavcodec/raw.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
@@ -80,7 +81,7 @@ static int frm_read_packet(AVFormatContext *avctx, AVPacket *pkt)
     if (s->count)
         return AVERROR_EOF;
 
-    packet_size = avpicture_get_size(stc->pix_fmt, stc->width, stc->height);
+    packet_size = av_image_get_buffer_size(stc->pix_fmt, stc->width, stc->height, 1);
     if (packet_size < 0)
         return AVERROR_INVALIDDATA;