diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-31 14:47:35 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-31 14:48:41 +0400 |
| commit | 1caa4123bd83f8b1f8a4e11a8d8539be7d54b105 (patch) | |
| tree | 094ece3f8531095920978d68b65e7119ab7007e7 /libavformat/avio.h | |
| parent | 8b8bf89e52bc3bf4be1a9f10eb1eb153a443172f (diff) | |
| parent | 229e2631be528c595650a7568c1d4df8af9c4944 (diff) | |
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.h')
| -rw-r--r-- | libavformat/avio.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index 173b6f7896..8cbd7aafec 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -447,6 +447,11 @@ attribute_deprecated int url_ferror(AVIOContext *s); attribute_deprecated int udp_set_remote_url(URLContext *h, const char *uri); attribute_deprecated int udp_get_local_port(URLContext *h); + +attribute_deprecated void init_checksum(AVIOContext *s, + unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), + unsigned long checksum); +attribute_deprecated unsigned long get_checksum(AVIOContext *s); #endif AVIOContext *avio_alloc_context( @@ -670,13 +675,6 @@ int url_open_dyn_packet_buf(AVIOContext **s, int max_packet_size); */ int url_close_dyn_buf(AVIOContext *s, uint8_t **pbuffer); -unsigned long ff_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, - unsigned int len); -unsigned long get_checksum(AVIOContext *s); -void init_checksum(AVIOContext *s, - unsigned long (*update_checksum)(unsigned long c, const uint8_t *p, unsigned int len), - unsigned long checksum); - #if FF_API_UDP_GET_FILE int udp_get_file_handle(URLContext *h); #endif |