Merge commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/241/head
Hendrik Leppkes 8 years ago
commit d7d6f9c782
  1. 1
      libavdevice/v4l2.c
  2. 1
      libavdevice/x11grab.c

@ -979,7 +979,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif
int res;
av_init_packet(pkt);
if ((res = mmap_read_frame(ctx, pkt)) < 0) {
return res;
}

@ -544,7 +544,6 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
s->time_frame += INT64_C(1000000);
} while ((s->time_frame * av_q2d(s->time_base) - curtime) <= 0);
av_init_packet(pkt);
pkt->data = image->data;
pkt->size = s->frame_size;
pkt->pts = curtime;

Loading…
Cancel
Save