From 98ef887a759c66febcb612407c6bb361c4d50bcb Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Fri, 7 Oct 2011 17:02:36 -0700
Subject: mpegps: Use av_get_packet() instead of poorly emulating it.

---
 libavformat/mpeg.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'libavformat/mpeg.c')

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index ef683b1a05..52bf40faa5 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -566,14 +566,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;
-- 
cgit v1.2.3