[FFmpeg-devel] [PATCH] flvdec: use flv_data_packet for TYPE_ONTEXTDATA
This was lost in commit ae48547a.
It fixes the following compiler warning:
warning: 'flv_data_packet' defined but not used
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
---
libavformat/flvdec.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 1701f76..a51016e 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -832,8 +832,11 @@ 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) {
+ret = flv_read_metabody(s, next);
+if (ret = 0) {
goto skip;
+} else if (ret == TYPE_ONTEXTDATA) {
+return flv_data_packet(s, pkt, dts, next);
}
avio_seek(s-pb, meta_pos, SEEK_SET);
}
--
2.1.4
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] flvdec: use flv_data_packet for TYPE_ONTEXTDATA
On Thu, Mar 12, 2015 at 08:57:10PM +0100, Andreas Cadhalpun wrote: This was lost in commit ae48547a. It fixes the following compiler warning: warning: 'flv_data_packet' defined but not used Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com --- libavformat/flvdec.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) please see [FFmpeg-devel] [PATCH 2/2] avformat/flvdec: re enable flv_data_packet() and use AVMEDIA_TYPE_SUBTITLE also review for above linked patch is welcome -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you think the mosad wants you dead since a long time then you are either wrong or dead since a long time. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
