diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-31 12:47:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-31 12:48:41 +0200 |
| commit | 1caa4123bd83f8b1f8a4e11a8d8539be7d54b105 (patch) | |
| tree | 094ece3f8531095920978d68b65e7119ab7007e7 /libavformat/nutdec.c | |
| parent | 8b8bf89e52bc3bf4be1a9f10eb1eb153a443172f (diff) | |
| parent | 229e2631be528c595650a7568c1d4df8af9c4944 (diff) | |
| download | ffmpeg-1caa4123bd83f8b1f8a4e11a8d8539be7d54b105.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers
mlp_parse.c: set AVCodecContext channel_layout
APIChanges: mark the place where 0.6 was branched.
avio: make get_checksum() internal.
avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h
avio: make init_checksum() internal.
NOT MERGED Add MxPEG decoder
NOT MERGED Add support for picture_ptr field in MJpegDecodeContext
NOT MERGED Move MJPEG's input buffer preprocessing in separate public function
NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder
sndio bug fix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index b957644f12..bd77f785dc 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -104,14 +104,14 @@ static int get_packetheader(NUTContext *nut, AVIOContext *bc, int calculate_chec startcode= av_be2ne64(startcode); startcode= ff_crc04C11DB7_update(0, (uint8_t*)&startcode, 8); - init_checksum(bc, ff_crc04C11DB7_update, startcode); + ffio_init_checksum(bc, ff_crc04C11DB7_update, startcode); size= ffio_read_varlen(bc); if(size > 4096) avio_rb32(bc); - if(get_checksum(bc) && size > 4096) + if(ffio_get_checksum(bc) && size > 4096) return -1; - init_checksum(bc, calculate_checksum ? ff_crc04C11DB7_update : NULL, 0); + ffio_init_checksum(bc, calculate_checksum ? ff_crc04C11DB7_update : NULL, 0); return size; } @@ -285,7 +285,7 @@ static int decode_main_header(NUTContext *nut){ assert(nut->header_len[0]==0); } - if(skip_reserved(bc, end) || get_checksum(bc)){ + if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "main header checksum mismatch\n"); return AVERROR_INVALIDDATA; } @@ -374,7 +374,7 @@ static int decode_stream_header(NUTContext *nut){ ffio_read_varlen(bc); // samplerate_den GET_V(st->codec->channels, tmp > 0) } - if(skip_reserved(bc, end) || get_checksum(bc)){ + if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "stream header %d checksum mismatch\n", stream_id); return -1; } @@ -469,7 +469,7 @@ static int decode_info_header(NUTContext *nut){ } } - if(skip_reserved(bc, end) || get_checksum(bc)){ + if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "info header checksum mismatch\n"); return -1; } @@ -493,7 +493,7 @@ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){ ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count], tmp / nut->time_base_count); - if(skip_reserved(bc, end) || get_checksum(bc)){ + if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n"); return -1; } @@ -590,7 +590,7 @@ static int find_and_decode_index(NUTContext *nut){ } } - if(skip_reserved(bc, end) || get_checksum(bc)){ + if(skip_reserved(bc, end) || ffio_get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "index checksum mismatch\n"); goto fail; } |