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_xiph.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_xiph.c')
-rw-r--r-- | libavformat/rtpdec_xiph.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 43f72a2305..dc34f9e224 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -306,7 +306,8 @@ parse_packed_headers(const uint8_t * packed_headers, return 0; } -static int xiph_parse_fmtp_pair(AVStream* stream, +static int xiph_parse_fmtp_pair(AVFormatContext *s, + AVStream* stream, PayloadContext *xiph_data, char *attr, char *value) { @@ -321,7 +322,7 @@ static int xiph_parse_fmtp_pair(AVStream* stream, } else if (!strcmp(value, "YCbCr-4:4:4")) { codec->pix_fmt = AV_PIX_FMT_YUV444P; } else { - av_log(codec, AV_LOG_ERROR, + av_log(s, AV_LOG_ERROR, "Unsupported pixel format %s\n", attr); return AVERROR_INVALIDDATA; } @@ -360,12 +361,12 @@ static int xiph_parse_fmtp_pair(AVStream* stream, (decoded_packet, decoded_packet + packet_size, codec, xiph_data); } else { - av_log(codec, AV_LOG_ERROR, + av_log(s, AV_LOG_ERROR, "Out of memory while decoding SDP configuration.\n"); result = AVERROR(ENOMEM); } } else { - av_log(codec, AV_LOG_ERROR, "Packet too large\n"); + av_log(s, AV_LOG_ERROR, "Packet too large\n"); result = AVERROR_INVALIDDATA; } av_free(decoded_packet); @@ -382,7 +383,7 @@ static int xiph_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, + return ff_parse_fmtp(s, s->streams[st_index], data, p, xiph_parse_fmtp_pair); } |