MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jvdemux: correct size for truncated packets

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-03 05:24:26 +02:00
parent 699083edce
commit 9d0c71e5e3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/jvdec.c
View File

@ -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;

2
tests/ref/fate/jv
View File

@ -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

2
tests/ref/fate/jv-demux
View File

@ -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