X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnutdec.c;h=08563806498f86ba6aa3d93ed41e80dc33962f3d;hb=d552f616a26623e5b593e4d3474c61563f3939fd;hp=2957a2b173f65ff7d9f4b11d38cd5373e824c97a;hpb=4727ec3c0e64b9144006abf82e080fb734ad4b0a;p=ffmpeg diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 2957a2b173f..08563806498 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -30,11 +30,7 @@ #undef NDEBUG #include -#if FF_API_MAX_STREAMS -#define NUT_MAX_STREAMS MAX_STREAMS -#else #define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */ -#endif static int get_str(AVIOContext *bc, char *string, unsigned int maxlen){ unsigned int len= ffio_read_varlen(bc); @@ -194,7 +190,6 @@ static int decode_main_header(NUTContext *nut){ uint64_t tmp, end; unsigned int stream_count; int i, j, tmp_stream, tmp_mul, tmp_pts, tmp_size, count, tmp_res, tmp_head_idx; - int64_t tmp_match; end= get_packetheader(nut, bc, 1, MAIN_STARTCODE); end += avio_tell(bc); @@ -222,7 +217,6 @@ static int decode_main_header(NUTContext *nut){ tmp_pts=0; tmp_mul=1; tmp_stream=0; - tmp_match= 1-(1LL<<62); tmp_head_idx= 0; for(i=0; i<256;){ int tmp_flags = ffio_read_varlen(bc); @@ -236,7 +230,7 @@ static int decode_main_header(NUTContext *nut){ else tmp_res = 0; if(tmp_fields>5) count = ffio_read_varlen(bc); else count = tmp_mul - tmp_size; - if(tmp_fields>6) tmp_match = get_s(bc); + if(tmp_fields>6) get_s(bc); if(tmp_fields>7) tmp_head_idx= ffio_read_varlen(bc); while(tmp_fields-- > 8)