Take the target address family in account when determining the family of

[ffmpeg] / libavformat / nutdec.c

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 25e739b6b93a50b6db024af191388a55f07c5404..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;
 }
@@ -425,7 +425,6 @@ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){
     AVFormatContext *s= nut->avf;
     ByteIOContext *bc = &s->pb;
     int64_t end, tmp;
-    AVRational time_base;
 
     nut->last_syncpoint_pos= url_ftell(bc)-8;
 
@@ -757,7 +756,6 @@ static int64_t nut_read_timestamp(AVFormatContext *s, int stream_index, int64_t
 av_log(s, AV_LOG_DEBUG, "read_timestamp(X,%d,%"PRId64",%"PRId64")\n", stream_index, *pos_arg, pos_limit);
 
     pos= *pos_arg;
-resync:
     do{
         pos= find_startcode(bc, SYNCPOINT_STARTCODE, pos)+1;
         if(pos < 1){