diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:40:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:40:13 +0200 |
| commit | 19b9e07ef5fdd8558735538a04fac7f428df190c (patch) | |
| tree | 00cb7526992d731ba21897a88188f7a41433f161 /libavformat/rtpdec.h | |
| parent | f233666880afd1f2c0b9902c762df7a8733510a8 (diff) | |
| parent | 0307cc2253e76772b1c645ac6117d08da87a147c (diff) | |
| download | ffmpeg-19b9e07ef5fdd8558735538a04fac7f428df190c.tar.gz | |
Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'
* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
rtpdec: pass an AVFormatContext to ff_parse_fmtp()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.h')
| -rw-r--r-- | libavformat/rtpdec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 7e356c048d..7b41cc4b5a 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -200,8 +200,10 @@ RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id, int ff_rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); -int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p, - int (*parse_fmtp)(AVStream *stream, +int ff_parse_fmtp(AVFormatContext *s, + AVStream *stream, PayloadContext *data, const char *p, + int (*parse_fmtp)(AVFormatContext *s, + AVStream *stream, PayloadContext *data, char *attr, char *value)); |