virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

Revert "matroskadec: set default duration for simple block"

Browse Source 
This reverts commit 98a7d560b4.
This has been implemented differently by aurel already
This commit is contained in:
Michael Niedermayer
2011-03-25 12:00:17 +01:00
parent 797ef671dd
commit 1c0a472630
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/matroskadec.c
View File

@ -1859,8 +1859,6 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska)
for (i=0; i<blocks_list->nb_elem; i++) for (i=0; i<blocks_list->nb_elem; i++)
if (blocks[i].bin.size > 0 && blocks[i].bin.data) { if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; 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, res=matroska_parse_block(matroska,
blocks[i].bin.data, blocks[i].bin.size, blocks[i].bin.data, blocks[i].bin.size,
blocks[i].bin.pos, cluster.timecode, blocks[i].bin.pos, cluster.timecode,