diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:55:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:58:15 +0200 |
| commit | 7ac167493e5404fd2d3f307d02127f23fca970f0 (patch) | |
| tree | bea8a71cd59b1ea9a63692f7df1bdedb8446a9c1 /libavformat/mpegts.c | |
| parent | 859676dd426e7051b41b174886e6e64271e93cdc (diff) | |
| parent | e006d71fa849542eb27146efac629288703b3d75 (diff) | |
| download | ffmpeg-7ac167493e5404fd2d3f307d02127f23fca970f0.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index af0cadbb5a..803acb3ce3 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1350,7 +1350,7 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size) for(;;) { len = avio_read(pb, buf, TS_PACKET_SIZE); if (len != TS_PACKET_SIZE) - return AVERROR(EIO); + return len < 0 ? len : AVERROR_EOF; /* check paquet sync byte */ if (buf[0] != 0x47) { /* find a new packet start */ |