Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

Unified Diff: chromium/deprecated/patches/from_upstream/38_webm_cues_before_first_cluster.patch

Issue 9290059: Initial commit of all previous Chrome build scripts. (Closed) Base URL: http://git.chromium.org/chromium/third_party/ffmpeg.git@master
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromium/deprecated/patches/from_upstream/38_webm_cues_before_first_cluster.patch
diff --git a/chromium/deprecated/patches/from_upstream/38_webm_cues_before_first_cluster.patch b/chromium/deprecated/patches/from_upstream/38_webm_cues_before_first_cluster.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d02f6105ca74170aea445ef4b19f5aecf83ea972
--- /dev/null
+++ b/chromium/deprecated/patches/from_upstream/38_webm_cues_before_first_cluster.patch
@@ -0,0 +1,56 @@
+diff -wurp -N orig/libavformat/matroskadec.c ffmpeg/libavformat/matroskadec.c
+--- orig/libavformat/matroskadec.c 2011-09-30 14:39:42.993442677 -0700
++++ ffmpeg/libavformat/matroskadec.c 2011-09-30 14:41:40.483401611 -0700
+@@ -1229,21 +1229,12 @@ static void matroska_execute_seekhead(Ma
+ }
+ }
+
+-static void matroska_parse_cues(MatroskaDemuxContext *matroska) {
+- EbmlList *seekhead_list = &matroska->seekhead;
+- MatroskaSeekhead *seekhead = seekhead_list->elem;
++static void matroska_add_index_entries(MatroskaDemuxContext *matroska) {
+ EbmlList *index_list;
+ MatroskaIndex *index;
+ int index_scale = 1;
+ int i, j;
+
+- for (i = 0; i < seekhead_list->nb_elem; i++)
+- if (seekhead[i].id == MATROSKA_ID_CUES)
+- break;
+- assert(i <= seekhead_list->nb_elem);
+-
+- matroska_parse_seekhead_entry(matroska, i);
+-
+ index_list = &matroska->index;
+ index = index_list->elem;
+ if (index_list->nb_elem
+@@ -1265,6 +1256,20 @@ static void matroska_parse_cues(Matroska
+ }
+ }
+
++static void matroska_parse_cues(MatroskaDemuxContext *matroska) {
++ EbmlList *seekhead_list = &matroska->seekhead;
++ MatroskaSeekhead *seekhead = seekhead_list->elem;
++ int i;
++
++ for (i = 0; i < seekhead_list->nb_elem; i++)
++ if (seekhead[i].id == MATROSKA_ID_CUES)
++ break;
++ assert(i <= seekhead_list->nb_elem);
++
++ matroska_parse_seekhead_entry(matroska, i);
++ matroska_add_index_entries(matroska);
++}
++
+ static int matroska_aac_profile(char *codec_id)
+ {
+ static const char * const aac_profiles[] = { "MAIN", "LC", "SSR" };
+@@ -1660,6 +1665,8 @@ static int matroska_read_header(AVFormat
+ max_start = chapters[i].start;
+ }
+
++ matroska_add_index_entries(matroska);
++
+ matroska_convert_tags(s);
+
+ return 0;

Powered by Google App Engine
This is Rietveld 408576698