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/avio_internal.h | |
| 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/avio_internal.h')
| -rw-r--r-- | libavformat/avio_internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 53121ff44c..343a1185ea 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -74,5 +74,11 @@ int64_t ffio_read_seek (AVIOContext *h, int stream_index, int ff_udp_set_remote_url(URLContext *h, const char *uri); int ff_udp_get_local_port(URLContext *h); +void ffio_init_checksum(AVIOContext *s, + unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), + unsigned long checksum); +unsigned long ffio_get_checksum(AVIOContext *s); +unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, + unsigned int len); #endif // AVFORMAT_AVIO_INTERNAL_H |