diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:31:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-15 11:31:13 +0100 |
| commit | a9b1536a018b867e3458a278c2992f7cd2fb707d (patch) | |
| tree | 55556d53044f7e8854f59c9eb7fcab76f3ea19d1 /libavformat/movenchint.c | |
| parent | 4d941eac1655b21af33c6e4d52b7bfd7f9e5b990 (diff) | |
| parent | b74dbdd5e99aed7f3bf1ecb5da1b374e5ba35768 (diff) | |
| download | ffmpeg-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/movenchint.c')
| -rw-r--r-- | libavformat/movenchint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenchint.c b/libavformat/movenchint.c index 9c4ddeb372..cc90f0b45a 100644 --- a/libavformat/movenchint.c +++ b/libavformat/movenchint.c @@ -44,7 +44,7 @@ int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index) track->enc->codec_tag = track->tag; ret = ff_rtp_chain_mux_open(&track->rtp_ctx, s, src_st, NULL, - RTP_MAX_PACKET_SIZE); + RTP_MAX_PACKET_SIZE, src_index); if (ret < 0) goto fail; |