diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 01:40:09 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-10 01:40:13 +0400 |
| commit | 19b9e07ef5fdd8558735538a04fac7f428df190c (patch) | |
| tree | 00cb7526992d731ba21897a88188f7a41433f161 /libavformat/rtpdec_mpeg4.c | |
| parent | f233666880afd1f2c0b9902c762df7a8733510a8 (diff) | |
| parent | 0307cc2253e76772b1c645ac6117d08da87a147c (diff) | |
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_mpeg4.c')
| -rw-r--r-- | libavformat/rtpdec_mpeg4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 0ea5594c06..53921f2e97 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -208,7 +208,8 @@ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data, return 0; } -static int parse_fmtp(AVStream *stream, PayloadContext *data, +static int parse_fmtp(AVFormatContext *s, + AVStream *stream, PayloadContext *data, char *attr, char *value) { AVCodecContext *codec = stream->codec; @@ -246,7 +247,7 @@ static int parse_sdp_line(AVFormatContext *s, int st_index, return 0; if (av_strstart(line, "fmtp:", &p)) - return ff_parse_fmtp(s->streams[st_index], data, p, parse_fmtp); + return ff_parse_fmtp(s, s->streams[st_index], data, p, parse_fmtp); return 0; } |