diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-12-06 21:38:05 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-12-06 21:38:05 +0000 |
| commit | 80016c48b07fac94f0bf3470a7322c2a022256a0 (patch) | |
| tree | 26570e3dc7b2fff86e6b03fd0df4e1ad69ee8e16 | |
| parent | 012cd15fc4af505c659f1852594d52cd029363c6 (diff) | |
rm encoding fix
Originally committed as revision 3736 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/rm.c | 6 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 2 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/rm.c b/libavformat/rm.c index 45cc170cd6..6dea24ce9f 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -373,13 +373,13 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int } else { put_byte(pb, 0x01); } - 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)); /* total frame size */ + put_be16(pb, 0x4000 + (size)); /* offset from the start or the end */ #else /* full frame */ write_packet_header(s, size + 6); 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 */ #endif put_byte(pb, stream->nb_frames & 0xff); diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index 698e9391ce..be1cba54ac 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -95,7 +95,7 @@ stddev: 8.87 PSNR:29.15 bytes:7602176 6262762 ./data/a-ljpeg.avi 799d3db687f6cdd7a837ec156efc171f *./data/out.yuv stddev: 0.00 PSNR:99.99 bytes:7602176 -5f51e30b621683e59edbab2e7c3f8c36 *./data/a-rv10.rm +49c87af74432890cadb28b93da1c653d *./data/a-rv10.rm 677483 ./data/a-rv10.rm f2b7fcff9de17f5aecfeb1090fe1963b *./data/out.yuv stddev: 8.08 PSNR:29.97 bytes:7602176 diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 0137bf5106..386bc28967 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -5,7 +5,7 @@ ffmpeg regression test c83444a0e8ef47b6af1d868d1bb21696 *./data/b-libav.asf 342967 ./data/b-libav.asf ./data/b-libav.asf CRC=750f18c7 -1cbf838e659d7fc3d3e33f4187b91f6c *./data/b-libav.rm +5240a23a9264bc6062d6739c70825ace *./data/b-libav.rm 360251 ./data/b-libav.rm 90784a1b9589095f20fc6bcc0cc23cc4 *./data/b-libav.mpg 387072 ./data/b-libav.mpg |