RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm encoding fix 

Originally committed as revision 3736 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-12-06 21:38:05 +00:00
parent 012cd15fc4
commit 80016c48b0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rm.c
View File

@ -373,13 +373,13 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int
} else { } else {
put_byte(pb, 0x01); put_byte(pb, 0x01);
} }
put_be16(pb, 0x4000 | (size)); /* total frame size */ put_be16(pb, 0x4000 + (size)); /* total frame size */
put_be16(pb, 0x4000 | (size)); /* offset from the start or the end */ put_be16(pb, 0x4000 + (size)); /* offset from the start or the end */
#else #else
/* full frame */ /* full frame */
write_packet_header(s, size + 6); write_packet_header(s, size + 6);
put_byte(pb, 0xc0); put_byte(pb, 0xc0);
put_be16(pb, 0x4000 | size); /* total frame size */ put_be16(pb, 0x4000 + size); /* total frame size */
put_be16(pb, 0x4000 + packet_number * 126); /* position in stream */ put_be16(pb, 0x4000 + packet_number * 126); /* position in stream */
#endif #endif
put_byte(pb, stream->nb_frames & 0xff); put_byte(pb, stream->nb_frames & 0xff);

2
tests/ffmpeg.regression.ref
View File

@ -95,7 +95,7 @@ stddev: 8.87 PSNR:29.15 bytes:7602176
6262762 ./data/a-ljpeg.avi 6262762 ./data/a-ljpeg.avi
799d3db687f6cdd7a837ec156efc171f *./data/out.yuv 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv
stddev: 0.00 PSNR:99.99 bytes:7602176 stddev: 0.00 PSNR:99.99 bytes:7602176
5f51e30b621683e59edbab2e7c3f8c36 *./data/a-rv10.rm 49c87af74432890cadb28b93da1c653d *./data/a-rv10.rm
677483 ./data/a-rv10.rm 677483 ./data/a-rv10.rm
f2b7fcff9de17f5aecfeb1090fe1963b *./data/out.yuv f2b7fcff9de17f5aecfeb1090fe1963b *./data/out.yuv
stddev: 8.08 PSNR:29.97 bytes:7602176 stddev: 8.08 PSNR:29.97 bytes:7602176

2
tests/libav.regression.ref
View File

@ -5,7 +5,7 @@ ffmpeg regression test
c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf
342967 ./data/b-libav.asf 342967 ./data/b-libav.asf
./data/b-libav.asf CRC=750f18c7 ./data/b-libav.asf CRC=750f18c7
1cbf838e659d7fc3d3e33f4187b91f6c *./data/b-libav.rm 5240a23a9264bc6062d6739c70825ace *./data/b-libav.rm
360251 ./data/b-libav.rm 360251 ./data/b-libav.rm
90784a1b9589095f20fc6bcc0cc23cc4 *./data/b-libav.mpg 90784a1b9589095f20fc6bcc0cc23cc4 *./data/b-libav.mpg
387072 ./data/b-libav.mpg 387072 ./data/b-libav.mpg