[FFmpeg-cvslog] Revert "matroskadec: set default duration for simple block"
Michael Niedermayer
git at videolan.org
Fri Mar 25 12:05:24 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 25 12:00:17 2011 +0100| [1c0a472630838c3b32231e646ad44e8afd313a66] | committer: Michael Niedermayer
Revert "matroskadec: set default duration for simple block"
This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea.
This has been implemented differently by aurel already
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1c0a472630838c3b32231e646ad44e8afd313a66
---
libavformat/matroskadec.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 2bb1215..3358e03 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1859,8 +1859,6 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
for (i=0; i<blocks_list->nb_elem; i++)
if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
- if (!blocks[i].non_simple)
- blocks[i].duration = AV_NOPTS_VALUE;
res=matroska_parse_block(matroska,
blocks[i].bin.data, blocks[i].bin.size,
blocks[i].bin.pos, cluster.timecode,
More information about the ffmpeg-cvslog
mailing list