diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-03 05:24:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-03 05:26:15 +0200 |
| commit | 9d0c71e5e34dec2c6246bf47da8d9674c92f85c1 (patch) | |
| tree | d1cd3dcbeef762dc248a3f414214ca13715e32af | |
| parent | 699083edce2bf52afc8ebb03dea259c8e26c750b (diff) | |
| download | ffmpeg-9d0c71e5e34dec2c6246bf47da8d9674c92f85c1.tar.gz | |
jvdemux: correct size for truncated packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/jvdec.c | 2 | ||||
| -rw-r--r-- | tests/ref/fate/jv | 2 | ||||
| -rw-r--r-- | tests/ref/fate/jv-demux | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index 3977594f8b..504be089c7 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -164,7 +164,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt) AV_WL32(pkt->data, jvf->video_size); pkt->data[4] = jvf->video_type; - if (avio_read(pb, pkt->data + JV_PREAMBLE_SIZE, size) < 0) + if ((size = avio_read(pb, pkt->data + JV_PREAMBLE_SIZE, size)) < 0) return AVERROR(EIO); pkt->size = size + JV_PREAMBLE_SIZE; diff --git a/tests/ref/fate/jv b/tests/ref/fate/jv index 7a64348d80..88b345c85b 100644 --- a/tests/ref/fate/jv +++ b/tests/ref/fate/jv @@ -6,4 +6,4 @@ 0, 5, 5, 1, 192000, 0xb8e331eb 0, 6, 6, 1, 192000, 0xd35b2053 0, 7, 7, 1, 192000, 0x01062188 -0, 8, 8, 1, 192000, 0xed783572 +0, 8, 8, 1, 192000, 0xa3a73b87 diff --git a/tests/ref/fate/jv-demux b/tests/ref/fate/jv-demux index 27f775ee22..c57fce0217 100644 --- a/tests/ref/fate/jv-demux +++ b/tests/ref/fate/jv-demux @@ -9,7 +9,7 @@ 0, 5, 5, 1, 13940, 0x064c350a 0, 6, 6, 1, 14418, 0x078d2dd2 0, 7, 7, 1, 14539, 0x145167ed -0, 8, 8, 1, 14700, 0x03de8939 +0, 8, 8, 1, 2552, 0xcf2b1db7 1, 131072, 131072, 1764, 1764, 0x30be734d 1, 132836, 132836, 1764, 1764, 0xa4c873a7 1, 134600, 134600, 1764, 1764, 0xd5f17443 |