[SCM] libav/experimental: move crc wrapper to slightly better spot
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:05:12 UTC 2013
The following commit has been merged in the experimental branch:
commit 5c2198b1841fa451ace272128966a3facc8932ea
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Aug 9 16:46:48 2007 +0000
move crc wrapper to slightly better spot
Originally committed as revision 10022 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 5f81957..4c41db3 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -21,6 +21,10 @@
#include "nut.h"
+unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len){
+ return av_crc(av_crc04C11DB7, checksum, buf, len);
+}
+
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
int i;
for(i=0; i<nut->avf->nb_streams; i++){
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 9dadbff..a96d111 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -92,12 +92,7 @@ typedef struct {
struct AVTreeNode *syncpoints;
} NUTContext;
-
-//FIXME move to a common spot, like crc.c/h
-static unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len){
- return av_crc(av_crc04C11DB7, checksum, buf, len);
-}
-
+unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len);
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val);
#endif /* AVFORMAT_NUT_H */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list