[FFmpeg-cvslog] avformat/flvdec: do not inject dts= 0 metadata packets which failed to be parsed into a new data stream
ffmpeg | branch: release/2.2 | Michael Niedermayer michae...@gmx.at | Thu Jan
1 18:07:24 2015 +0100| [1c983ee2c10ee75251678a596a8e07f62cbfcf53] | committer:
Michael Niedermayer
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed
into a new data stream
Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 322f0f5960a743cac47252d90a0f1ea7a025feff)
Conflicts:
libavformat/flvdec.c
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c983ee2c10ee75251678a596a8e07f62cbfcf53
---
libavformat/flvdec.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index b11e335..a0189b1 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -541,13 +541,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t
next_pos)
type = avio_r8(ioc);
if (type != AMF_DATA_TYPE_STRING ||
amf_get_string(ioc, buffer, sizeof(buffer)) 0)
-return -1;
+return 2;
if (!strcmp(buffer, onTextData))
return 1;
if (strcmp(buffer, onMetaData))
-return -1;
+return 2;
// find the streams now so that amf_parse_object doesn't need to do
// the lookup every time it is called.
@@ -813,7 +813,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket
*pkt)
stream_type=FLV_STREAM_TYPE_DATA;
if (size 13 + 1 + 4 dts == 0) { // Header-type metadata stuff
meta_pos = avio_tell(s-pb);
-if (flv_read_metabody(s, next) == 0) {
+if (flv_read_metabody(s, next) = 0) {
goto skip;
}
avio_seek(s-pb, meta_pos, SEEK_SET);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/flvdec: do not inject dts= 0 metadata packets which failed to be parsed into a new data stream
ffmpeg | branch: release/2.5 | Michael Niedermayer michae...@gmx.at | Thu Jan
1 18:07:24 2015 +0100| [eac0451e47381300fc2944268faf9cda550e6481] | committer:
Michael Niedermayer
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed
into a new data stream
Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 322f0f5960a743cac47252d90a0f1ea7a025feff)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eac0451e47381300fc2944268faf9cda550e6481
---
libavformat/flvdec.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 54f2f56..568a654 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -558,13 +558,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t
next_pos)
type = avio_r8(ioc);
if (type != AMF_DATA_TYPE_STRING ||
amf_get_string(ioc, buffer, sizeof(buffer)) 0)
-return -1;
+return 2;
if (!strcmp(buffer, onTextData))
return 1;
if (strcmp(buffer, onMetaData) strcmp(buffer, onCuePoint))
-return -1;
+return 2;
// find the streams now so that amf_parse_object doesn't need to do
// the lookup every time it is called.
@@ -822,7 +822,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket
*pkt)
stream_type=FLV_STREAM_TYPE_DATA;
if (size 13 + 1 + 4 dts == 0) { // Header-type metadata stuff
meta_pos = avio_tell(s-pb);
-if (flv_read_metabody(s, next) == 0) {
+if (flv_read_metabody(s, next) = 0) {
goto skip;
}
avio_seek(s-pb, meta_pos, SEEK_SET);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/flvdec: do not inject dts= 0 metadata packets which failed to be parsed into a new data stream
ffmpeg | branch: release/2.3 | Michael Niedermayer michae...@gmx.at | Thu Jan
1 18:07:24 2015 +0100| [c9a25ff5a02a228f5f15bd203e37f505e4b79634] | committer:
Michael Niedermayer
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed
into a new data stream
Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 322f0f5960a743cac47252d90a0f1ea7a025feff)
Conflicts:
libavformat/flvdec.c
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9a25ff5a02a228f5f15bd203e37f505e4b79634
---
libavformat/flvdec.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ee73dd7..d77c06d 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -555,13 +555,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t
next_pos)
type = avio_r8(ioc);
if (type != AMF_DATA_TYPE_STRING ||
amf_get_string(ioc, buffer, sizeof(buffer)) 0)
-return -1;
+return 2;
if (!strcmp(buffer, onTextData))
return 1;
if (strcmp(buffer, onMetaData))
-return -1;
+return 2;
// find the streams now so that amf_parse_object doesn't need to do
// the lookup every time it is called.
@@ -819,7 +819,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket
*pkt)
stream_type=FLV_STREAM_TYPE_DATA;
if (size 13 + 1 + 4 dts == 0) { // Header-type metadata stuff
meta_pos = avio_tell(s-pb);
-if (flv_read_metabody(s, next) == 0) {
+if (flv_read_metabody(s, next) = 0) {
goto skip;
}
avio_seek(s-pb, meta_pos, SEEK_SET);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] avformat/flvdec: do not inject dts= 0 metadata packets which failed to be parsed into a new data stream
ffmpeg | branch: master | Michael Niedermayer michae...@gmx.at | Thu Jan 1
18:07:24 2015 +0100| [322f0f5960a743cac47252d90a0f1ea7a025feff] | committer:
Michael Niedermayer
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed
into a new data stream
Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=322f0f5960a743cac47252d90a0f1ea7a025feff
---
libavformat/flvdec.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 8a4addb..993b5a2 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -566,13 +566,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t
next_pos)
type = avio_r8(ioc);
if (type != AMF_DATA_TYPE_STRING ||
amf_get_string(ioc, buffer, sizeof(buffer)) 0)
-return -1;
+return 2;
if (!strcmp(buffer, onTextData))
return 1;
if (strcmp(buffer, onMetaData) strcmp(buffer, onCuePoint))
-return -1;
+return 2;
// find the streams now so that amf_parse_object doesn't need to do
// the lookup every time it is called.
@@ -830,7 +830,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket
*pkt)
stream_type=FLV_STREAM_TYPE_DATA;
if (size 13 + 1 + 4 dts == 0) { // Header-type metadata stuff
meta_pos = avio_tell(s-pb);
-if (flv_read_metabody(s, next) == 0) {
+if (flv_read_metabody(s, next) = 0) {
goto skip;
}
avio_seek(s-pb, meta_pos, SEEK_SET);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
