← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavformat/rtpdec_amr.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/rtpdec_amr.c
139
139
    return 0;
140
140
}
141
141
 
142
 
static int amr_parse_fmtp(AVStream *stream, PayloadContext *data,
 
142
static int amr_parse_fmtp(AVFormatContext *s,
 
143
                          AVStream *stream, PayloadContext *data,
143
144
                          char *attr, char *value)
144
145
{
145
146
    /* Some AMR SDP configurations contain "octet-align", without
147
148
     * interpret it as "1".
148
149
     */
149
150
    if (!strcmp(value, "")) {
150
 
        av_log(NULL, AV_LOG_WARNING, "AMR fmtp attribute %s had "
151
 
                                     "nonstandard empty value\n", attr);
 
151
        av_log(s, AV_LOG_WARNING, "AMR fmtp attribute %s had "
 
152
                                  "nonstandard empty value\n", attr);
152
153
        strcpy(value, "1");
153
154
    }
154
155
    if (!strcmp(attr, "octet-align"))
177
178
     * separated key/value pairs.
178
179
     */
179
180
    if (av_strstart(line, "fmtp:", &p)) {
180
 
        ret = ff_parse_fmtp(s->streams[st_index], data, p, amr_parse_fmtp);
 
181
        ret = ff_parse_fmtp(s, s->streams[st_index], data, p, amr_parse_fmtp);
181
182
        if (!data->octet_align || data->crc ||
182
183
            data->interleaving || data->channels != 1) {
183
184
            av_log(s, AV_LOG_ERROR, "Unsupported RTP/AMR configuration!\n");