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_latm.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_latm.c')
| -rw-r--r-- | libavformat/rtpdec_latm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c index fdeff3a151..389648253a 100644 --- a/libavformat/rtpdec_latm.c +++ b/libavformat/rtpdec_latm.c @@ -142,7 +142,8 @@ end: return ret; } -static int parse_fmtp(AVStream *stream, PayloadContext *data, +static int parse_fmtp(AVFormatContext *s, + AVStream *stream, PayloadContext *data, char *attr, char *value) { int res; @@ -154,7 +155,7 @@ static int parse_fmtp(AVStream *stream, PayloadContext *data, } else if (!strcmp(attr, "cpresent")) { int cpresent = atoi(value); if (cpresent != 0) - avpriv_request_sample(NULL, + avpriv_request_sample(s, "RTP MP4A-LATM with in-band configuration"); } @@ -170,7 +171,7 @@ static int latm_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; } |