diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-07-05 07:01:07 +0000 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2014-07-09 13:40:54 +0000 |
commit | 0307cc2253e76772b1c645ac6117d08da87a147c (patch) | |
tree | a888e60dee2ceb9b4abbe48ec4f13a70303d4015 /libavformat/rtpdec.c | |
parent | 650d384048ed42579cc6d67bf32a94b468c0b6cb (diff) | |
download | android_external_ffmpeg-0307cc2253e76772b1c645ac6117d08da87a147c.tar.gz android_external_ffmpeg-0307cc2253e76772b1c645ac6117d08da87a147c.tar.bz2 android_external_ffmpeg-0307cc2253e76772b1c645ac6117d08da87a147c.zip |
rtpdec: pass an AVFormatContext to ff_parse_fmtp()
Use it for logging, instead of NULL or the stream codec context.
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 3984489e2c..308a48a7e0 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -826,8 +826,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)) { @@ -852,7 +854,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; |