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.c | |
| 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.c')
| -rw-r--r-- | libavformat/rtpdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index ed118b0485..64a1c27f8d 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -833,8 +833,10 @@ void ff_rtp_parse_close(RTPDemuxContext *s) av_free(s); } -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)) { @@ -859,7 +861,7 @@ int ff_parse_fmtp(AVStream *stream, PayloadContext *data, const char *p, while (ff_rtsp_next_attr_and_value(&p, attr, sizeof(attr), value, value_size)) { - res = parse_fmtp(stream, data, attr, value); + res = parse_fmtp(s, stream, data, attr, value); if (res < 0 && res != AVERROR_PATCHWELCOME) { av_free(value); return res; |