Merge commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207'

* commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207':
  lavd: Drop unneeded av_init_packet()s

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavdevice/v4l2.c
index ddf331d43d0d5114fdfbd35c2caa32a274740f7a,47241e47a1fbb29f138ec263a1ed81a671d81dcc..ae51d837af3570d1f9c1640a0aafcced5f30a970
--- 1/libavdevice/v4l2.c
--- 2/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@@ -979,8 -861,7 +979,7 @@@ FF_ENABLE_DEPRECATION_WARNING
  #endif
      int res;
  
-     av_init_packet(pkt);
 -    if ((res = mmap_read_frame(s1, pkt)) < 0) {
 +    if ((res = mmap_read_frame(ctx, pkt)) < 0) {
          return res;
      }
  

diff --cc libavdevice/x11grab.c
index 5c8cfc1324959b2f69cc03eb7b246727e65d5fb8,60e2560d6b681166e0170bb28794732926b35abf..65b409f0c10cdbaf7a52c81127c36a5038e44ce5
--- 1/libavdevice/x11grab.c
--- 2/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@@ -539,12 -511,6 +539,11 @@@ static int x11grab_read_packet(AVFormat
          nanosleep(&ts, NULL);
      }
  
-     av_init_packet(pkt);
 +    /* Calculate the time of the next frame */
 +    do {
 +      s->time_frame += INT64_C(1000000);
 +    } while ((s->time_frame * av_q2d(s->time_base) - curtime) <= 0);
 +
      pkt->data = image->data;
      pkt->size = s->frame_size;
      pkt->pts  = curtime;