Originally committed as revision 23330 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -1793,7 +1793,7 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) · 1792 unmodified lines | |||
| 1793 | blocks_list = &cluster.blocks; | 1793 | blocks_list = &cluster.blocks; |
| 1794 | blocks = blocks_list->elem; | 1794 | blocks = blocks_list->elem; |
| 1795 | for (i=0; i<blocks_list->nb_elem; i++) | 1795 | for (i=0; i<blocks_list->nb_elem; i++) |
| 1796 | if (blocks[i].bin.size > 0) { | 1796 | if (blocks[i].bin.size > 0 && blocks[i].bin.data) { |
| 1797 | int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; | 1797 | int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1; |
| 1798 | res=matroska_parse_block(matroska, | 1798 | res=matroska_parse_block(matroska, |
| 1799 | blocks[i].bin.data, blocks[i].bin.size, | 1799 | blocks[i].bin.data, blocks[i].bin.size, |