diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-10-07 17:02:36 -0700 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:31 +0100 |
| commit | 4faa00b256bfdecb4ee1c14f332a7d0b2f539e94 (patch) | |
| tree | b3451515df738bfe51aff678d234e341eb62b7a7 | |
| parent | 90d7146511db0e2dd2d2b1baf2ceb7177b30dd8d (diff) | |
| download | ffmpeg-4faa00b256bfdecb4ee1c14f332a7d0b2f539e94.tar.gz | |
mpegps: Use av_get_packet() instead of poorly emulating it.
(cherry picked from commit 98ef887a759c66febcb612407c6bb361c4d50bcb)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavformat/mpeg.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 9407b3f5b6..3fc83bb167 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -561,14 +561,7 @@ static int mpegps_read_packet(AVFormatContext *s, else if (st->codec->bits_per_coded_sample == 28) return AVERROR(EINVAL); } - av_new_packet(pkt, len); - ret = avio_read(s->pb, pkt->data, pkt->size); - if (ret < 0) { - pkt->size = 0; - } else if (ret < pkt->size) { - pkt->size = ret; - memset(pkt->data + ret, 0, FF_INPUT_BUFFER_PADDING_SIZE); - } + ret = av_get_packet(s->pb, pkt, len); pkt->pts = pts; pkt->dts = dts; pkt->pos = dummy_pos; |