aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-14 19:46:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-20 02:25:54 +0100
commit0fb2b616142e42a3384cafc4281dfa196c7b4be6 (patch)
treedc7be26f4da989aae00a61895d6debb88f1ea92a
parent0d277be45ae9bfbf4fb51408c3f3ef5b42296d66 (diff)
downloadffmpeg-0fb2b616142e42a3384cafc4281dfa196c7b4be6.tar.gz
avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()
Fixes Ticket3686 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/utils.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d9ffaed0b9..b657b9e8b5 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -568,6 +568,8 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in
int default_stream_index = av_find_default_stream_index(s);
if (s->streams[default_stream_index]->pts_wrap_reference == AV_NOPTS_VALUE) {
for (i = 0; i < s->nb_streams; i++) {
+ if (av_find_program_from_stream(s, NULL, i))
+ continue;
s->streams[i]->pts_wrap_reference = pts_wrap_reference;
s->streams[i]->pts_wrap_behavior = pts_wrap_behavior;
}