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_ilbc.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_ilbc.c')
| -rw-r--r-- | libavformat/rtpdec_ilbc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/rtpdec_ilbc.c b/libavformat/rtpdec_ilbc.c index 2bd86147de..aa1579fa63 100644 --- a/libavformat/rtpdec_ilbc.c +++ b/libavformat/rtpdec_ilbc.c @@ -23,7 +23,8 @@ #include "rtpdec_formats.h" #include "libavutil/avstring.h" -static int ilbc_parse_fmtp(AVStream *stream, PayloadContext *data, +static int ilbc_parse_fmtp(AVFormatContext *s, + AVStream *stream, PayloadContext *data, char *attr, char *value) { if (!strcmp(attr, "mode")) { @@ -36,7 +37,7 @@ static int ilbc_parse_fmtp(AVStream *stream, PayloadContext *data, stream->codec->block_align = 50; break; default: - av_log(NULL, AV_LOG_ERROR, "Unsupported iLBC mode %d\n", mode); + av_log(s, AV_LOG_ERROR, "Unsupported iLBC mode %d\n", mode); return AVERROR(EINVAL); } } @@ -54,7 +55,7 @@ static int ilbc_parse_sdp_line(AVFormatContext *s, int st_index, st = s->streams[st_index]; if (av_strstart(line, "fmtp:", &p)) { - int ret = ff_parse_fmtp(st, data, p, ilbc_parse_fmtp); + int ret = ff_parse_fmtp(s, st, data, p, ilbc_parse_fmtp); if (ret < 0) return ret; if (!st->codec->block_align) { |