diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:33:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 02:34:17 +0100 |
| commit | 5162af67f41214edacefe05d9723e4a6d9847900 (patch) | |
| tree | e07706bd952bc563e0b56adc26199675e19238d1 /libavformat/rtpdec_formats.h | |
| parent | 3f5d1c8130b1326d779c4216886272a3efce816a (diff) | |
| parent | a505c0d7373336a4cc5aa2022111c46bdd388b1f (diff) | |
Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'
* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
rtp: Initial H.261 support
Conflicts:
Changelog
libavformat/rtpdec_h261.c
libavformat/rtpenc_h261.c
libavformat/sdp.c
libavformat/version.h
See: 50a4d5cfc6749932347ee38c25b5040aea4b13a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_formats.h')
| -rw-r--r-- | libavformat/rtpdec_formats.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index 803410e164..87e316fac5 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -31,10 +31,6 @@ */ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p); -int ff_h261_handle_packet(AVFormatContext *ctx, PayloadContext *data, - AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, uint16_t seq, int flags); - int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len, uint16_t seq, int flags); |