[FFmpeg-cvslog] lavf/matroskaenc: Fix Cues on Audio for WebM DASH

Vignesh Venkatasubramanian git at videolan.org
Fri Jun 6 21:41:25 CEST 2014


ffmpeg | branch: master | Vignesh Venkatasubramanian <vigneshv at google.com> | Fri Jun  6 11:26:11 2014 -0700| [c80181352c177746b6493a80d0bc57926a300fa2] | committer: Michael Niedermayer

lavf/matroskaenc: Fix Cues on Audio for WebM DASH

Fix a change that was broken by [1]. Cues must be added for audio frames
on cluster start for WebM when the DASH flag is passed. Restoring
correct functionality.

[1] http://goo.gl/xYLq7Z

Signed-off-by: Vignesh Venkatasubramanian <vigneshv at google.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/matroskaenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 3f88346..7cd418a 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1646,7 +1646,7 @@ static int mkv_write_packet_internal(AVFormatContext *s, AVPacket *pkt, int add_
 
     if (codec->codec_type != AVMEDIA_TYPE_SUBTITLE) {
         mkv_write_block(s, pb, MATROSKA_ID_SIMPLEBLOCK, pkt, keyframe << 7);
-        if (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe) {
+        if (codec->codec_type == AVMEDIA_TYPE_VIDEO && keyframe || add_cue) {
             ret = mkv_add_cuepoint(mkv->cues, pkt->stream_index, dash_tracknum, ts, mkv->cluster_pos, relative_packet_pos, -1);
             if (ret < 0) return ret;
         }



More information about the ffmpeg-cvslog mailing list