diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/rangecoder.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/rangecoder.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/contrib/ffmpeg/libavcodec/rangecoder.c b/contrib/ffmpeg/libavcodec/rangecoder.c index fcd564ace..34cda723f 100644 --- a/contrib/ffmpeg/libavcodec/rangecoder.c +++ b/contrib/ffmpeg/libavcodec/rangecoder.c @@ -17,7 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ /** @@ -35,8 +34,8 @@ #include <string.h> #include "avcodec.h" -#include "common.h" #include "rangecoder.h" +#include "bytestream.h" void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size){ @@ -54,8 +53,7 @@ void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){ /* cast to avoid compiler warning */ ff_init_range_encoder(c, (uint8_t *) buf, buf_size); - c->low =(*c->bytestream++)<<8; - c->low+= *c->bytestream++; + c->low = bytestream_get_be16(&c->bytestream); } void ff_build_rac_states(RangeCoder *c, int factor, int max_p){ @@ -111,9 +109,10 @@ int ff_rac_terminate(RangeCoder *c){ return c->bytestream - c->bytestream_start; } -#if 0 //selftest +#ifdef TEST #define SIZE 10240 -int main(){ +#undef random +int main(void){ RangeCoder c; uint8_t b[9*SIZE]; uint8_t r[9*SIZE]; @@ -135,7 +134,7 @@ START_TIMER STOP_TIMER("put_rac") } - ff_put_rac_terminate(&c); + ff_rac_terminate(&c); ff_init_range_decoder(&c, b, SIZE); @@ -150,4 +149,4 @@ STOP_TIMER("get_rac") return 0; } -#endif +#endif /* TEST */ |