aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/sapenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-15 11:31:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-15 11:31:13 +0100
commita9b1536a018b867e3458a278c2992f7cd2fb707d (patch)
tree55556d53044f7e8854f59c9eb7fcab76f3ea19d1 /libavformat/sapenc.c
parent4d941eac1655b21af33c6e4d52b7bfd7f9e5b990 (diff)
parentb74dbdd5e99aed7f3bf1ecb5da1b374e5ba35768 (diff)
downloadffmpeg-a9b1536a018b867e3458a278c2992f7cd2fb707d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: bgmc: Fix av_malloc checks in ff_bgmc_init() rtp: set the payload type as stream id Conflicts: libavformat/rtpenc_chain.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sapenc.c')
-rw-r--r--libavformat/sapenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 3de615d25d..7abfd50d35 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -151,7 +151,7 @@ static int sap_write_header(AVFormatContext *s)
ret = AVERROR(EIO);
goto fail;
}
- ret = ff_rtp_chain_mux_open(&contexts[i], s, s->streams[i], fd, 0);
+ ret = ff_rtp_chain_mux_open(&contexts[i], s, s->streams[i], fd, 0, i);
if (ret < 0)
goto fail;
s->streams[i]->priv_data = contexts[i];