diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 12:00:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-25 12:00:17 +0100 |
| commit | 1c0a472630838c3b32231e646ad44e8afd313a66 (patch) | |
| tree | 6ec381a98c99be649a36430086900b4d56dad446 | |
| parent | 797ef671dda9094640ade203a09dc59e9bf328a4 (diff) | |
| download | ffmpeg-1c0a472630838c3b32231e646ad44e8afd313a66.tar.gz | |
Revert "matroskadec: set default duration for simple block"
This reverts commit 98a7d560b4f835ba5b99b9974ee1a2c096198bea.
This has been implemented differently by aurel already
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 2bb1215176..3358e038f5 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, |