Merge commit '0b699920f3c0b2e30969b38ce59226653f9d80ec'

[ffmpeg] / libavdevice / v4l2.c

diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 9e8ba1e5b617e71b3dbe7c97f1912bf4d5502f08..fee0fb0e92da60c0313df66f1608761f7a0350df 100644 (file)
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -550,7 +550,7 @@ static int mmap_read_frame(AVFormatContext *ctx, AVPacket *pkt)
 
         res = enqueue_buffer(s, &buf);
         if (res) {
-            av_free_packet(pkt);
+            av_packet_unref(pkt);
             return res;
         }
     } else {
@@ -939,8 +939,8 @@ static int v4l2_read_header(AVFormatContext *ctx)
         goto fail;
 
     st->codec->pix_fmt = ff_fmt_v4l2ff(desired_format, codec_id);
-    s->frame_size =
-        avpicture_get_size(st->codec->pix_fmt, s->width, s->height);
+    s->frame_size = av_image_get_buffer_size(st->codec->pix_fmt,
+                                             s->width, s->height, 1);
 
     if ((res = mmap_init(ctx)) ||
         (res = mmap_start(ctx)) < 0)