[SCM] libav/experimental: Add #undef random and call the right function to fix test program compilation.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:12:09 UTC 2013
The following commit has been merged in the experimental branch:
commit 79bfd0ef766b620c9ad5568d8f8cadfa0516498a
Author: Diego Biurrun <diego at biurrun.de>
Date: Wed Jan 23 10:18:08 2008 +0000
Add #undef random and call the right function to fix test program compilation.
Originally committed as revision 11600 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index 829d9ab..34cda72 100644
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -111,6 +111,7 @@ int ff_rac_terminate(RangeCoder *c){
#ifdef TEST
#define SIZE 10240
+#undef random
int main(void){
RangeCoder c;
uint8_t b[9*SIZE];
@@ -133,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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list