[FFmpeg-cvslog] avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference ()
Michael Niedermayer
git at videolan.org
Sat Dec 20 02:47:11 CET 2014
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 14 19:46:31 2014 +0100| [0fb2b616142e42a3384cafc4281dfa196c7b4be6] | committer: Michael Niedermayer
avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()
Fixes Ticket3686
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fb2b616142e42a3384cafc4281dfa196c7b4be6
---
libavformat/utils.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d9ffaed..b657b9e 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;
}
More information about the ffmpeg-cvslog
mailing list