diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-18 10:20:14 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-18 10:20:14 +0100 |
| commit | d7d6f9c78272949b8b13a52eaa850f0d63842fcf (patch) | |
| tree | af0dbf5b342cc634c02171c20cb36afafca070d9 | |
| parent | 9e1ddc08208d7b484d5d97d4e169c75b91e3ff21 (diff) | |
| parent | 0b1bd1b2057d41fd0ccba7317911c484a50f9207 (diff) | |
| download | ffmpeg-d7d6f9c78272949b8b13a52eaa850f0d63842fcf.tar.gz | |
Merge commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207'
* commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207':
lavd: Drop unneeded av_init_packet()s
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavdevice/v4l2.c | 1 | ||||
| -rw-r--r-- | libavdevice/x11grab.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index ddf331d43d..ae51d837af 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.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; } diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 5c8cfc1324..65b409f0c1 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -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; |