rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so...

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10873 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/avio.h b/libavformat/avio.h
index eb93e47e5daff33f375343f657adb8c871d0ce1d..6a9cbae539b6e83eecb5700304c80b01ba0e0de4 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -258,6 +258,7 @@ int url_open_dyn_packet_buf(ByteIOContext *s, int max_packet_size);
  */
 int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer);
 
+unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len);
 unsigned long get_checksum(ByteIOContext *s);
 void init_checksum(ByteIOContext *s, unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), unsigned long checksum);
 

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 6370f57be682e25121d164c5e70cbc10373fe9f2..c186aa2ea302cf8dd8dba894a4b256ce797ccaaf 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -20,6 +20,7 @@
  */
 #include "avformat.h"
 #include "avio.h"
+#include "crc.h"
 #include <stdarg.h>
 
 #define IO_BUFFER_SIZE 32768
@@ -286,6 +287,10 @@ static void fill_buffer(ByteIOContext *s)
     }
 }
 
+unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len){
+    return av_crc(av_crc04C11DB7, checksum, buf, len);
+}
+
 unsigned long get_checksum(ByteIOContext *s){
     s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
     s->update_checksum= NULL;

diff --git a/libavformat/nut.c b/libavformat/nut.c
index e329a510d19777b013aeca45359950b0d46ba433..034934dc9d17e3e02b464079226fd2bbf2b693f5 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -22,10 +22,6 @@
 #include "nut.h"
 #include "tree.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 74492cd9adc4b3f7cccf8db0c89e9ff6b2ef7e86..1636527ed2c667d19053bb6cd785d3b1241a67b2 100644 (file)
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -24,7 +24,6 @@
 
 //#include <limits.h>
 #include "avformat.h"
-#include "crc.h"
 //#include "mpegaudio.h"
 #include "riff.h"
 //#include "adler32.h"
@@ -93,7 +92,6 @@ typedef struct {
     struct AVTreeNode *syncpoints;
 } NUTContext;
 
-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);
 int64_t ff_lsb2full(StreamContext *stream, int64_t lsb);
 int ff_nut_sp_pos_cmp(syncpoint_t *a, syncpoint_t *b);

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 91b13009eaf3e4aca1dd2703705bfe49eee83c49..e3b117d8bf93ae1881406abaf6d0198d16f82077 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -104,16 +104,16 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch
 //    start= url_ftell(bc) - 8;
 
     startcode= be2me_64(startcode);
-    startcode= av_crc04C11DB7_update(0, &startcode, 8);
+    startcode= ff_crc04C11DB7_update(0, &startcode, 8);
 
-    init_checksum(bc, av_crc04C11DB7_update, startcode);
+    init_checksum(bc, ff_crc04C11DB7_update, startcode);
     size= get_v(bc);
     if(size > 4096)
         get_be32(bc);
     if(get_checksum(bc) && size > 4096)
         return -1;
 
-    init_checksum(bc, calculate_checksum ? av_crc04C11DB7_update : NULL, 0);
+    init_checksum(bc, calculate_checksum ? ff_crc04C11DB7_update : NULL, 0);
 
     return size;
 }

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index b28566100cc2779b2f31cf83688d3b2911161f0f..f0ae12a2f8e76330fad0df2749bdc7e875a7b65f 100644 (file)
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -196,14 +196,14 @@ static void put_packet(NUTContext *nut, ByteIOContext *bc, ByteIOContext *dyn_bc
     int forw_ptr= dyn_size + 4*calculate_checksum;
 
     if(forw_ptr > 4096)
-        init_checksum(bc, av_crc04C11DB7_update, 0);
+        init_checksum(bc, ff_crc04C11DB7_update, 0);
     put_be64(bc, startcode);
     put_v(bc, forw_ptr);
     if(forw_ptr > 4096)
         put_le32(bc, get_checksum(bc));
 
     if(calculate_checksum)
-        init_checksum(bc, av_crc04C11DB7_update, 0);
+        init_checksum(bc, ff_crc04C11DB7_update, 0);
     put_buffer(bc, dyn_buf, dyn_size);
     if(calculate_checksum)
         put_le32(bc, get_checksum(bc));
@@ -535,7 +535,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt){
     flags= fc->flags;
     needed_flags= get_needed_flags(nut, nus, fc, pkt);
 
-    init_checksum(bc, av_crc04C11DB7_update, 0);
+    init_checksum(bc, ff_crc04C11DB7_update, 0);
     put_byte(bc, frame_code);
     if(flags & FLAG_CODED){
         put_v(bc, (flags^needed_flags) & ~(FLAG_CODED));