summaryrefslogtreecommitdiff
path: root/libavformat/sapenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-31 12:37:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-31 12:53:46 +0200
commit8c895ae73f81a5db66f3bfeac3d91da5c4e179e2 (patch)
tree91232c2e193df19a9bb1a22657f3e3e07cb610df /libavformat/sapenc.c
parent4ba8560077a19ae12bf0c875c57cdaa72d690441 (diff)
parentf797b134cad4d248b1c8955659997980d0668bc3 (diff)
Merge commit 'f797b134cad4d248b1c8955659997980d0668bc3'
* commit 'f797b134cad4d248b1c8955659997980d0668bc3': rtpenc_chain: Don't copy the time base to the source stream by default See: 1fe40e1b0538a8eb8425123c47775b5d141ae084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sapenc.c')
-rw-r--r--libavformat/sapenc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 2564698e7b..82a6ef67fd 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -158,6 +158,7 @@ static int sap_write_header(AVFormatContext *s)
if (ret < 0)
goto fail;
s->streams[i]->priv_data = contexts[i];
+ s->streams[i]->time_base = contexts[i]->streams[0]->time_base;
av_strlcpy(contexts[i]->filename, url, sizeof(contexts[i]->filename));
}