[FFmpeg-cvslog] avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference ()

2015-01-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.2 | Michael Niedermayer michae...@gmx.at | Sun Dec 
14 19:46:31 2014 +0100| [30099bf0f01486b54aeea772ed21315dab731479] | 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 michae...@gmx.at
(cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d)

Signed-off-by: Michael Niedermayer michae...@gmx.at

 http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30099bf0f01486b54aeea772ed21315dab731479
---

 libavformat/utils.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 738355f..80a909a 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -706,6 +706,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;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference ()

2015-01-06 Thread Michael Niedermayer 
ffmpeg | branch: release/2.3 | Michael Niedermayer michae...@gmx.at | Sun Dec 
14 19:46:31 2014 +0100| [0621421ee2a36bc0abd4901f363c4c3cf05d2e4a] | 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 michae...@gmx.at
(cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d)

Signed-off-by: Michael Niedermayer michae...@gmx.at

 http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0621421ee2a36bc0abd4901f363c4c3cf05d2e4a
---

 libavformat/utils.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e095d60..a4929b3 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -730,6 +730,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;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference ()

2014-12-19 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer michae...@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 michae...@gmx.at
(cherry picked from commit a29524bf2e197dd8d582445de0fe17f03b79f79d)

Signed-off-by: Michael Niedermayer michae...@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;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference ()

2014-12-14 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Sun Dec 14 
19:46:31 2014 +0100| [a29524bf2e197dd8d582445de0fe17f03b79f79d] | 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 michae...@gmx.at

 http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a29524bf2e197dd8d582445de0fe17f03b79f79d
---

 libavformat/utils.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9328d6b..a883745 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -594,6 +594,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;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog