| OLD | NEW |
| (Empty) | |
| 1 diff -wurp -N orig/libavformat/matroskadec.c ffmpeg/libavformat/matroskadec.c |
| 2 --- orig/libavformat/matroskadec.c 2011-09-30 14:39:42.993442677 -0700 |
| 3 +++ ffmpeg/libavformat/matroskadec.c 2011-09-30 14:41:40.483401611 -0700 |
| 4 @@ -1229,21 +1229,12 @@ static void matroska_execute_seekhead(Ma |
| 5 } |
| 6 } |
| 7 |
| 8 -static void matroska_parse_cues(MatroskaDemuxContext *matroska) { |
| 9 - EbmlList *seekhead_list = &matroska->seekhead; |
| 10 - MatroskaSeekhead *seekhead = seekhead_list->elem; |
| 11 +static void matroska_add_index_entries(MatroskaDemuxContext *matroska) { |
| 12 EbmlList *index_list; |
| 13 MatroskaIndex *index; |
| 14 int index_scale = 1; |
| 15 int i, j; |
| 16 |
| 17 - for (i = 0; i < seekhead_list->nb_elem; i++) |
| 18 - if (seekhead[i].id == MATROSKA_ID_CUES) |
| 19 - break; |
| 20 - assert(i <= seekhead_list->nb_elem); |
| 21 - |
| 22 - matroska_parse_seekhead_entry(matroska, i); |
| 23 - |
| 24 index_list = &matroska->index; |
| 25 index = index_list->elem; |
| 26 if (index_list->nb_elem |
| 27 @@ -1265,6 +1256,20 @@ static void matroska_parse_cues(Matroska |
| 28 } |
| 29 } |
| 30 |
| 31 +static void matroska_parse_cues(MatroskaDemuxContext *matroska) { |
| 32 + EbmlList *seekhead_list = &matroska->seekhead; |
| 33 + MatroskaSeekhead *seekhead = seekhead_list->elem; |
| 34 + int i; |
| 35 + |
| 36 + for (i = 0; i < seekhead_list->nb_elem; i++) |
| 37 + if (seekhead[i].id == MATROSKA_ID_CUES) |
| 38 + break; |
| 39 + assert(i <= seekhead_list->nb_elem); |
| 40 + |
| 41 + matroska_parse_seekhead_entry(matroska, i); |
| 42 + matroska_add_index_entries(matroska); |
| 43 +} |
| 44 + |
| 45 static int matroska_aac_profile(char *codec_id) |
| 46 { |
| 47 static const char * const aac_profiles[] = { "MAIN", "LC", "SSR" }; |
| 48 @@ -1660,6 +1665,8 @@ static int matroska_read_header(AVFormat |
| 49 max_start = chapters[i].start; |
| 50 } |
| 51 |
| 52 + matroska_add_index_entries(matroska); |
| 53 + |
| 54 matroska_convert_tags(s); |
| 55 |
| 56 return 0; |
| OLD | NEW |