diff options
| author | Julien Moutte <julien@moutte.net> | 2007-09-26 16:30:50 +0000 |
|---|---|---|
| committer | Julien Moutte <julien@moutte.net> | 2007-09-26 16:30:50 +0000 |
| commit | 188ce39697a43b0aac433ba55c6f496399d52843 (patch) | |
| tree | 6293f85952a3d75c3a76698bf563a6d2876de086 | |
| parent | a37eba036b6f0c545f14ec17cd2c37b2ca5167a4 (diff) | |
| download | gst-plugins-bad-188ce39697a43b0aac433ba55c6f496399d52843.tar.gz gst-plugins-bad-188ce39697a43b0aac433ba55c6f496399d52843.tar.bz2 gst-plugins-bad-188ce39697a43b0aac433ba55c6f496399d52843.zip | |
gst/flv/gstflvparse.c: codec_data is needed for every tag not just the first one. (Fix a stupid bug i introduced with...
Original commit message from CVS:
2007-09-26 Julien MOUTTE <julien@moutte.net>
* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
(gst_flv_parse_tag_video): codec_data is needed for every tag
not just the first one. (Fix a stupid bug i introduced without
testing)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/flv/gstflvparse.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,6 +1,13 @@ 2007-09-26 Julien MOUTTE <julien@moutte.net> * gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio), + (gst_flv_parse_tag_video): codec_data is needed for every tag + not just the first one. (Fix a stupid bug i introduced without + testing) + +2007-09-26 Julien MOUTTE <julien@moutte.net> + + * gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio), (gst_flv_parse_tag_video): Fix bit masks operations to be sure we detect the codec_tags and sample rates correctly. Fix raw audio caps generation. diff --git a/gst/flv/gstflvparse.c b/gst/flv/gstflvparse.c index a7ca1a89..bf475cb3 100644 --- a/gst/flv/gstflvparse.c +++ b/gst/flv/gstflvparse.c @@ -658,6 +658,9 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, const guint8 * data, } /* Codec tag */ codec_tag = flags & 0x0F; + if (codec_tag == 4 || codec_tag == 5) { + codec_data = 2; + } GST_LOG_OBJECT (demux, "video tag with codec tag %u, keyframe (%d) " "(flags %02X)", codec_tag, keyframe, flags); @@ -685,11 +688,9 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, const guint8 * data, break; case 4: caps = gst_caps_new_simple ("video/x-vp6-flash", NULL); - codec_data = 2; break; case 5: caps = gst_caps_new_simple ("video/x-vp6-flash", NULL); - codec_data = 2; break; default: GST_WARNING_OBJECT (demux, "unsupported video codec tag %d", codec_tag); |